patch by stephend <stephen.donner@gmail.com>, r=iann sr=neil git-svn-id: svn://10.0.0.236/trunk@178580 18797224-902f-48f8-a5cc-f745e15eee43
patch by stephend <stephen.donner@gmail.com>, r=iann sr=neil git-svn-id: svn://10.0.0.236/trunk@178580 18797224-902f-48f8-a5cc-f745e15eee43