patch by Stephen Walker <sdwalker@myrealbox.com>, r=shaver, a=shaver git-svn-id: svn://10.0.0.236/trunk@173171 18797224-902f-48f8-a5cc-f745e15eee43
patch by Stephen Walker <sdwalker@myrealbox.com>, r=shaver, a=shaver git-svn-id: svn://10.0.0.236/trunk@173171 18797224-902f-48f8-a5cc-f745e15eee43