Comment 7 for bug 628901

Here is another try. I am quite newbie with this bazaar thing. I cleaned the patch up a lot, so it should be much less changes in the problematic file now.