git-svn-id: svn://10.0.0.236/trunk@119274 18797224-902f-48f8-a5cc-f745e15eee43
that these changes *do not* affect the current build, except for some minor edits. git-svn-id: svn://10.0.0.236/trunk@118136 18797224-902f-48f8-a5cc-f745e15eee43