Pull battery-2.6.24 into release branch

This commit is contained in:
Len Brown 2007-12-13 22:16:14 -05:00
commit d020c36685