[powertop/f17: 2/2] Merge remote-tracking branch 'origin/f16' into f17

[Jaroslav Škarvada]

commit ec7fc6769f63a610276aed628c430a087cbfdb2b
Merge: 72cdb2c 93575a3
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Mar 7 17:26:11 2012 +0100

    Merge remote-tracking branch 'origin/f16' into f17
    
    Conflicts:
    	powertop.spec

 powertop-1.98-power-supply-units-fix.patch |   25 +++++++++++++++++++++++++
 powertop.spec                              |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --cc powertop.spec
index c116034,3065c74..1a0c16d
--- a/powertop.spec
+++ b/powertop.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:          powertop
  Version:       1.98
--Release:       5%{?dist}
++Release:       6%{?dist}
  Summary:       Power consumption monitor
  
  Group:         Applications/System
@@@ -59,9 -61,10 +61,13 @@@ rm -rf %{buildroot
  #%{_mandir}/man8/powertop.8*
  
  %changelog
 -* Wed Mar  7 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.98-5
++* Wed Mar  7 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.98-6
+ - Fixed power_supply units
+   Resolves: rhbz#800814
+ 
 +* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.98-5
 +- Rebuilt for c++ ABI breakage
 +
  * Fri Feb 24 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 1.98-4
  - Backported support for power_supply class
    (add-power-supply-class-support patch)