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)
commit07606302418de35eea1ec651e3f8d65d83ce7fa7
tree833d67d512b96acc6e1a1d4a3c77dca754d7ebfe
parentd9d83295e44db8b0c095f71d70c34dd426d3ee48
parent8d6ff1ec20809241873e3f6a45d426c09e486a62
Merge "fix undefined issue introduced by merging code" into devel