r= lots, see bug git-svn-id: svn://10.0.0.236/trunk@98337 18797224-902f-48f8-a5cc-f745e15eee43
-r aarol, jgaunt -sr brendan git-svn-id: svn://10.0.0.236/trunk@94685 18797224-902f-48f8-a5cc-f745e15eee43