patch by Robert Parenton, r=mconnor, a=asa git-svn-id: svn://10.0.0.236/trunk@174547 18797224-902f-48f8-a5cc-f745e15eee43