Merge branch 'battery' into release

This commit is contained in:
Len Brown 2009-01-09 03:36:59 -05:00
commit a8e896e281