Bug#403994: aub: resolve file conflict with webmagick.

* Daniel Kobras ([EMAIL PROTECTED]) [061224 07:42]: The attached diff should help resolve the file conflict with webmagick, and fixes a few errors that lintian barfs about along the way. Please apply, or drop me a note if you want me to upload the changes as an NMU. yes, please do so.

Bug#403994: aub: resolve file conflict with webmagick.

tags 403994 + patch thanks Moi! The attached diff should help resolve the file conflict with webmagick, and fixes a few errors that lintian barfs about along the way. Please apply, or drop me a note if you want me to upload the changes as an NMU. Regards, Daniel. diff -Nru