Merge remote-tracking branch 'battery/master'
commit66f510f779d7593974e150fd4470fa60be3e34ba
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:32:21 +0000 (31 12:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:32:21 +0000 (31 12:32 +1000)
tree79f3233f11cc918cc0f6a3f95f42f0f327a34855
parentb0204f464f18ea37f2b81626b5d8a3ae34743a78
parent85b5fbf784810d80aa09646189848c9ebc8a4ba2
Merge remote-tracking branch 'battery/master'