Merge "Fix compile error"
authorErich Keane <erich.keane@intel.com>
Wed, 8 Oct 2014 20:40:24 +0000 (13:40 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 8 Oct 2014 20:40:24 +0000 (13:40 -0700)

Trivial merge