Patch added in manually. Please attach patches rather than including
them in your message. Line wrapping sometimes occurs from the mail
program and these patches cannot be applied cleanly. In your case, the
last continuation character got wrapped and the patch did not apply past
that point).