Pull battery-2.6.24 into release branch
authorLen Brown <[email protected]>
Fri, 14 Dec 2007 03:16:14 +0000 (22:16 -0500)
committerLen Brown <[email protected]>
Fri, 14 Dec 2007 03:16:14 +0000 (22:16 -0500)

Trivial merge