original patch by benb r=rrelyea moa=kaie git-svn-id: svn://10.0.0.236/trunk@200822 18797224-902f-48f8-a5cc-f745e15eee43