Merge "First implementation for Client and Server in same process. Additionally...
authorErich Keane <erich.keane@intel.com>
Thu, 14 Aug 2014 20:41:04 +0000 (13:41 -0700)
committerGerrit Code Review <gerrit@fmygit6001.fm.intel.com>
Thu, 14 Aug 2014 20:41:04 +0000 (13:41 -0700)

Trivial merge