Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
authorLen Brown <len.brown@intel.com>
Mon, 15 Mar 2010 01:30:17 +0000 (21:30 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Mar 2010 01:30:17 +0000 (21:30 -0400)

Trivial merge