Comment 7 for bug 988984

Since the version in quantal now contains both fixes, here's an updated version of the patch. This fixes issues 1) and 2) from comment 5. As for 3), I'll try better next time.

I'll work on a test case if no one is able to validate the fix (once it's in -proposed).