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

[Peter Robinson]

commit 7c537c7c17f818da343ada6a1bdd9626f53de2b2
Merge: 36c784b 8098dc9
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Dec 25 17:42:29 2011 +0000

    Merge branch 'master' into f15

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