Comment 38 for bug 118605

I've now read all the comments of this bug as I should have done before I submitted my first comment/solution. The patch supplied by Ilja Pavkovic on 2008-03-19 is probably the correct way to solve the problem for all different configurations. It accomplish what I wrote above, and some more.