bug=337324 r=bsmedberg a=mconnor for the 1.8 branch git-svn-id: svn://10.0.0.236/trunk@199737 18797224-902f-48f8-a5cc-f745e15eee43
bug=337324 r=bsmedberg a=mconnor for the 1.8 branch git-svn-id: svn://10.0.0.236/trunk@199737 18797224-902f-48f8-a5cc-f745e15eee43