Comment 4 for bug 300814

This is in fact a merge, and the latest debdiff is not complete, due to the update being a merge. The previous changelog entries from Ubuntu are not present, and one of the changes itself at least, is not present either. Please see http://wiki.ubuntu.com/Merging for a starting point on what a merge is, and how you do one. There are likely other useful documents on the wiki about merging, but I don't have the URLs to hand at the moment.