Merge "fix undefined issue introduced by merging code" into devel
authorZhang Qiang <qiang.z.zhang@intel.com>
Thu, 23 Aug 2012 02:33:35 +0000 (19:33 -0700)
committerGerrit Code Review <gerrit2@otctools.jf.intel.com>
Thu, 23 Aug 2012 02:33:35 +0000 (19:33 -0700)

Trivial merge