patch by bsmedberg@covad.net r=roc+moz, sr=roc+moz, a=roc+moz git-svn-id: svn://10.0.0.236/trunk@137216 18797224-902f-48f8-a5cc-f745e15eee43
patch by bsmedberg@covad.net r=roc+moz, sr=roc+moz, a=roc+moz git-svn-id: svn://10.0.0.236/trunk@137216 18797224-902f-48f8-a5cc-f745e15eee43