patch by cst@andrew.cmu.edu r=aaronl sr=neil git-svn-id: svn://10.0.0.236/trunk@167077 18797224-902f-48f8-a5cc-f745e15eee43