Merge branch 'battery-sysfs-notifier' into release
Len Brown [Wed, 23 Mar 2011 06:34:18 +0000 (02:34 -0400)]

Trivial merge