Comment 8 for bug 405544

I tested the fix from git and it works. Can this please be sync'd into Karmic?