[olpc-powerd/f16: 3/3] Merge branch 'master' into f16

[Peter Robinson]

commit 997730f09107f0add51fe73b4874d75814fd6364
Merge: 841652a 8098dc9
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Dec 25 17:28:16 2011 +0000

    Merge branch 'master' into f16

 olpc-powerd-Makefile.patch |   11 -----------
 olpc-powerd.spec           |    9 +++++----
 sources                    |    2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)
---