Merge branch 'gpe-regression-fixes' into release
authorLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:51:49 +0000 (00:51 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:51:49 +0000 (00:51 -0400)

Trivial merge