Comment 9 for bug 736216

I uploaded the fix to natty-proposed. If you can reproduce, please give feedback once the version for natty-proposed hits the archive.

It does not apply cleanly to maverick, would be nice if someone could have a look.