r=bsmedberg, sr=jst git-svn-id: svn://10.0.0.236/trunk@189575 18797224-902f-48f8-a5cc-f745e15eee43
sort of thing. Bug 323810, r=bsmedberg, sr=jst git-svn-id: svn://10.0.0.236/trunk@189344 18797224-902f-48f8-a5cc-f745e15eee43