Merge "Fix some build issues"
authorDieter, William R <william.r.dieter@intel.com>
Fri, 25 Jul 2014 17:05:19 +0000 (10:05 -0700)
committerGerrit Code Review <gerrit@fmygit6002.fm.intel.com>
Fri, 25 Jul 2014 17:05:19 +0000 (10:05 -0700)

Trivial merge