Merge remote-tracking branch 'cpupowerutils/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:09:00 +0000 (12:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:09:00 +0000 (12:09 +1000)

Trivial merge