r=neil sr=jag original patch by neil git-svn-id: svn://10.0.0.236/trunk@138524 18797224-902f-48f8-a5cc-f745e15eee43