Comment 5 for bug 932860

ok, 3rd time lucky... this time just a debdiff as my bzr foo is failing.

Same comments as before stand, this is an attempt at multi-arching the package. I'm not 100% confident on some of the changes so it needs a thorough review.