Merge branch 'master' of https://vcs.maemo.org/git/kernel-power
authorThomas Tanner <tanner@mach.kyb.local>
Sun, 2 May 2010 15:55:24 +0000 (17:55 +0200)
committerThomas Tanner <tanner@mach.kyb.local>
Sun, 2 May 2010 15:55:24 +0000 (17:55 +0200)

Trivial merge