patch by bugzilla@gemal.dk r=caillon sr=alecf git-svn-id: svn://10.0.0.236/trunk@135169 18797224-902f-48f8-a5cc-f745e15eee43