r=edburns bugfix from Kyle. Prep for future work. git-svn-id: svn://10.0.0.236/trunk@142439 18797224-902f-48f8-a5cc-f745e15eee43
r=edburns git-svn-id: svn://10.0.0.236/trunk@141733 18797224-902f-48f8-a5cc-f745e15eee43