tree 39f7a1afe053ef8457f568cf4e1f9e960d1e6916
parent de96355c111679dd6e2c5c73e25e814c72510c58
parent 69d94ec6d83d84044252d9ba03f6a8970816e350
author Len Brown <len.brown@intel.com> 1312597002 -0400
committer Len Brown <len.brown@intel.com> 1312597002 -0400

Merge branch 'battery' into release