Merge branch 'master' of https://vcs.maemo.org/git/kernel-power
authorCorey O'Connor <coreyoconnor@gmail.com>
Wed, 4 Aug 2010 18:37:13 +0000 (11:37 -0700)
committerCorey O'Connor <coreyoconnor@gmail.com>
Wed, 4 Aug 2010 18:37:13 +0000 (11:37 -0700)

Trivial merge