Merge "Revert "Replace to_string and stoi""
authorErich Keane <erich.keane@intel.com>
Thu, 18 Sep 2014 17:32:45 +0000 (10:32 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Thu, 18 Sep 2014 17:32:45 +0000 (10:32 -0700)

Trivial merge