r=neil sr=jag patch by Chris Thomas <cst@andrew.cmu.edu> git-svn-id: svn://10.0.0.236/trunk@161597 18797224-902f-48f8-a5cc-f745e15eee43
r=neil sr=jag patch by Chris Thomas <cst@andrew.cmu.edu> git-svn-id: svn://10.0.0.236/trunk@161597 18797224-902f-48f8-a5cc-f745e15eee43