git-svn-id: svn://10.0.0.236/trunk@183062 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@182409 18797224-902f-48f8-a5cc-f745e15eee43
Patch by Marc Schumann <wurblzap@gmail.com> r=GavinS, mkanat a=justdave git-svn-id: svn://10.0.0.236/trunk@170004 18797224-902f-48f8-a5cc-f745e15eee43