Comment 2 for bug 483953

Following conversation with Scott Kitterman I've pushed some updates to the branch, and will be attaching a debdiff.

Note, however, that part of the work of this merge was repairing erroneously diverged bzr history in the debian vs. ubuntu bzr branches, as produced by some less-than-optimal decisions of the auto-importer.

Therefore if the debdiff is used for upload, it is important that my branch is pushed into the official packaging branch concurrently with the upload (after having 'bzr mark-uploaded' run on it), rather than letting the auto-importer import the upload.