r=varga, sr=alecf, patch by stephend git-svn-id: svn://10.0.0.236/trunk@135982 18797224-902f-48f8-a5cc-f745e15eee43