Merge branch 'battery' into release

This commit is contained in:
Len Brown 2009-04-05 01:39:26 -04:00
commit 3266d63c06
4 changed files with 27 additions and 16 deletions