r=sdagley, sr=peterv, a=asa, patch by ccarlen git-svn-id: svn://10.0.0.236/trunk@138003 18797224-902f-48f8-a5cc-f745e15eee43