git-svn-id: svn://10.0.0.236/trunk@175971 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@175916 18797224-902f-48f8-a5cc-f745e15eee43
Patch by Erik Stambaugh <erik@dasbistro.com> r=joel, r,a=justdave git-svn-id: svn://10.0.0.236/trunk@169438 18797224-902f-48f8-a5cc-f745e15eee43