Comment 7 for bug 804855

This might be better for someone a bit more experienced, since I think I'm doing something wrong. Apparently there's conflicts and a lot changed - but I literally removed one character and added a changelog entry via dch -i. Unless someone can explain what's mucking up, I really can't get my head around the problem and thus how to fix it properly without all the extra errors/conflicts appearing.