Comment 38 for bug 129007

Comment on attachment 279879
better patch

approved for 1.8.1.8 and 1.8.0.14, a=dveditz for release-drivers