[olpc-powerd/f16: 8/8] fix merge

[Peter Robinson]

commit 841652af5d16c4a994f64ac0931f243cb88f658b
Merge: 84acc26 2d94a14
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Nov 29 21:05:14 2011 +0000

    fix merge

 olpc-powerd.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc olpc-powerd.spec
index 8077efb,478bb42..c54782b
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@@ -135,14 -133,16 +135,18 @@@ f
  exit 0
  
  %changelog
 +* Tue Nov 29 2011 Peter Robinson <pbrobinson at fedoraproject.org> 40-1
 +- update to 40
  
- * Mon Nov 21 2011 Peter Robinson <pbrobinson at fedoraproject.org> 39-1
- - update to 39
- 
- * Sat Nov 19 2011 Peter Robinson <pbrobinson at fedoraproject.org> 38-1
- - update to 38
+ * Mon Nov 21 2011  <martin at laptop.org> - 39-1
+ - use /sys/power/wakeup_count to make wakeups more reliable
+ - fixes for ambient light backlight control reliability
+ 
+ * Tue Nov 19 2011  Peter Robinson <pbrobinson at fedoraproject.org> 38-1
+ - Add support for OLS and for sending and responding
+   to ambient-adjust events (for OLS-driven dimming)
+ - Reimplement wakeup control for 1.75 (75% done)
+ - Don't change the color/mono setting of the display
  
  * Wed Oct 19 2011 Daniel Drake <dsd at laptop.org> - 37-1
  - Reduce window for suspend during network connection