[olpc-powerd/f18: 4/4] fix merge

[Peter Robinson]

commit 08e139d63409c752e1c5bdec96cf07297541ccdc
Merge: 6aa7463 c8d4d31
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Jan 24 12:41:29 2013 +0000

    fix merge

 olpc-powerd.spec |    8 ++++++--
 sources          |    4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --cc sources
index 64bb1e8,1da940d..6542045
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +ccff7cb8cfee0593345673f79c026d90  olpc-powerd-107-git757a4a8.tar.gz
++=======
+ 30d1b37b72873b9565ed0e96373f6c85  olpc-powerd-108-git875dccf.tar.gz
++>>>>>>> master