Fix too long lines (bug 860052)

This is a merge request version of the patch I sent to bug 860052. Hopefully it's easier for you to apply.

Since it looks like you maintain the changelog by hand in git (as opposed to, e.g., gbp dch) I went ahead and included a changelog entry. I put my name/email address there, but of course you'll have to change that before uploading. Less there is any doubt, I am absolutely OK with you doing that.