Merge branches 'apei', 'battery-mwh-fix', 'bugzilla-10807', 'bugzilla-14736', 'bugzil...
authorLen Brown <len.brown@intel.com>
Wed, 29 Sep 2010 19:18:28 +0000 (15:18 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 29 Sep 2010 19:18:28 +0000 (15:18 -0400)

Trivial merge