Merge "CPP Collection"
authorWilliam Dieter <william.r.dieter@intel.com>
Wed, 20 Aug 2014 01:24:56 +0000 (18:24 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 20 Aug 2014 01:24:56 +0000 (18:24 -0700)

Trivial merge