r=justdave x2 a=justdave git-svn-id: svn://10.0.0.236/trunk@133471 18797224-902f-48f8-a5cc-f745e15eee43
r=gerv, justdave git-svn-id: svn://10.0.0.236/trunk@132553 18797224-902f-48f8-a5cc-f745e15eee43