Bug 390735, patch by Ryan Jones <sciguyryan@gmail.com>, r+sr=bzbarsky, a=jst git-svn-id: svn://10.0.0.236/trunk@231879 18797224-902f-48f8-a5cc-f745e15eee43