Comment 2 for bug 589209

Hi Lorenzo,

For a merge such as this, it is much better if you can provide a mergeable bzr branch instead of a debdiff; a mergeable branch makes it much easier to review the steps you've taken in the merge process, instead of being a flattened diff. Please see
<https://wiki.ubuntu.com/DistributedDevelopment/Documentation/Merging> for details.

I have reviewed your diff and it looks correct to me. Uploading shortly with a few minor adjustments to the changelog. Thank you for your contribution to Ubuntu!