Merge branch 'apei' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:02:22 +0000 (05:02 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:02:22 +0000 (05:02 -0500)

Trivial merge