Merge "IOT-57 fix. We were mis-assigning a pointer during construction"
authorErich Keane <erich.keane@intel.com>
Thu, 2 Oct 2014 18:15:20 +0000 (11:15 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Thu, 2 Oct 2014 18:15:20 +0000 (11:15 -0700)

Trivial merge