git-svn-id: svn://10.0.0.236/trunk@159356 18797224-902f-48f8-a5cc-f745e15eee43
Patch by alex@croczilla.com, r=sicking, sr=jst git-svn-id: svn://10.0.0.236/trunk@158808 18797224-902f-48f8-a5cc-f745e15eee43