Comment 16 for bug 585169

A version of this branch was extracted into a patch against the 0.2.7.1 release of phatch. It made its way to the Natty repositories as phatch 0.2.7.1-1.
The feedback so far is positive, testing is welcome.