Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ...
authorLen Brown <len.brown@intel.com>
Tue, 6 Apr 2010 21:06:22 +0000 (17:06 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 6 Apr 2010 21:06:22 +0000 (17:06 -0400)

Trivial merge