[olpc-powerd: 7/7] Merge branch 'f18' into f19

[Daniel Drake]

commit 1c6bd1a2c4207dc787c738e370881b5145dddd17
Merge: a32ec12 3fc38e6
Author: Daniel Drake <dsd at laptop.org>
Date:   Wed May 29 11:19:16 2013 -0600

    Merge branch 'f18' into f19
    
    Conflicts:
    	olpc-powerd.spec

 olpc-powerd.spec |   11 ++++++++---
 sources          |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc olpc-powerd.spec
index a9c9299,5c13e69..0dd6d64
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@@ -120,8 -120,14 +120,13 @@@ f
  exit 0
  
  %changelog
+ * Thu May 23 2013 Paul Fox <pgf at laptop.org>
+ - 110-1
+ - protect against negative seconds since the epoch (#12621)
+ - do a better job of detecting tty lockfiles (#11286)
+ 
 -* Sat Feb  9 2013 Paul Fox <pgf at laptop.org>
 -- 109-1
 -- inhibit suspend when HDMI is connected
 +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 108-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
  
  * Tue Jan 22 2013 Paul Fox <pgf at laptop.org>
  - 108-1