Patch by Colin S. Ogilvie <colin.ogilvie@gmail.com> r=jake git-svn-id: svn://10.0.0.236/trunk@167723 18797224-902f-48f8-a5cc-f745e15eee43
Patch by Colin S. Ogilvie <colin.ogilvie@gmail.com> r=jake git-svn-id: svn://10.0.0.236/trunk@167723 18797224-902f-48f8-a5cc-f745e15eee43