Comment 6 for bug 675108

Thanks for the patch Maxim. I have cleaned it up and placed it in a bzr branch so a dev can merge it. I also tested it and verified that it fixed the issue on Natty. I will need to do the same for Oneiric tonight before proposing both branches for merging.