Merge "Fix build issue for simpleserverHQ"
authorErich Keane <erich.keane@intel.com>
Wed, 15 Oct 2014 07:47:30 +0000 (00:47 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 15 Oct 2014 07:47:30 +0000 (00:47 -0700)

Trivial merge