Merge "- US1321 - Now, C++ API users will be able to register multiple types and...
authorKeane, Erich <erich.keane@intel.com>
Fri, 8 Aug 2014 23:48:27 +0000 (16:48 -0700)
committerGerrit Code Review <gerrit@fmygit6001.fm.intel.com>
Fri, 8 Aug 2014 23:48:27 +0000 (16:48 -0700)

Trivial merge