[kde-runtime: 2/2] Merge branch 'f17'

[Rex Dieter]

commit 3353621091917557889373bcb53e1e2817c7a13f
Merge: 3a3766b 653b94b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Feb 28 12:50:15 2012 -0600

    Merge branch 'f17'
    
    Conflicts:
    	kde-runtime.spec

 kde-runtime.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc kde-runtime.spec
index d84fb7c,d886987..653f84f
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@@ -7,7 -7,11 +7,7 @@@
  Name:    kde-runtime
  Summary: KDE Runtime
  Version: 4.8.0
--Release: 5%{?dist}
++Release: 6%{?dist}
  
  # http://techbase.kde.org/Policies/Licensing_Policy
  License: LGPLv2+ and GPLv2+
@@@ -322,9 -327,9 +322,12 @@@ f
  
  
  %changelog
 -* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.0-5
++* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.0-6
+ - Rebuilt for c++ ABI breakage
+ 
 +* Mon Feb 27 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-5
 +- Requires: dbus-x11 (#794958)
 +
  * Wed Feb 08 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.0-4
  - fix quoting in SELinux scriptlet (#788309)