patch by Gavin Sharp <gavin.sharp@gmail.com>, r=mconnor, a=asa git-svn-id: svn://10.0.0.236/trunk@171947 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@167899 18797224-902f-48f8-a5cc-f745e15eee43