Merge branch 'battery' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:39:26 +0000 (01:39 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:39:26 +0000 (01:39 -0400)

Trivial merge