r=varga, sr=sspitzer, a=asa, patch=neil git-svn-id: svn://10.0.0.236/trunk@115719 18797224-902f-48f8-a5cc-f745e15eee43