Merge pull request #4976 from jmarshallnz/stdstring_removal_part1
authorjmarshallnz <jcmarsha@gmail.com>
Fri, 4 Jul 2014 05:30:47 +0000 (17:30 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Fri, 4 Jul 2014 05:30:47 +0000 (17:30 +1200)
CStdString removal part1


Trivial merge