Merge "US1310: C++ Client will now do callbacks when an error callback is received...
authorErich Keane <erich.keane@intel.com>
Thu, 7 Aug 2014 21:31:51 +0000 (14:31 -0700)
committerGerrit Code Review <gerrit@fmygit6001.fm.intel.com>
Thu, 7 Aug 2014 21:31:51 +0000 (14:31 -0700)

Trivial merge