patch by Florian Quèze <f.qu@queze.net>, r=db48x, sr=neil git-svn-id: svn://10.0.0.236/trunk@231532 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@224478 18797224-902f-48f8-a5cc-f745e15eee43