Merge branch 'apei-release' into release
authorLen Brown <len.brown@intel.com>
Tue, 22 Mar 2011 05:41:47 +0000 (01:41 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 22 Mar 2011 05:41:47 +0000 (01:41 -0400)

Trivial merge