Comment 15 for bug 791497

This should work :) The additional changes might have been inside the diff because they will be in the next Debian revision of the GPK package. (and I just diff'ed the new version against that one in Debian experimental (and forgot about the few additional changes, which don't do anything good or bad, they're not really necessary))
Thanks for reviewing!