[kdebase/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit fad4b1e899f8231daf89dd213866d39b1066d65a
Merge: dcd8c08 a49061e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 13:16:59 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	kdebase.spec

 .gitignore   |    1 +
 kdebase.spec |   48 ++++++++++++++++++++++++++----------------------
 sources      |    2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)
---
diff --cc kdebase.spec
index 8991232,775e43e..2a1c723
--- a/kdebase.spec
+++ b/kdebase.spec
@@@ -281,9 -283,14 +283,11 @@@ f
  
  
  %changelog
- * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.7.2-3
- - Rebuilt for glibc bug#747377
+ * Sat Oct 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-1
+ - 4.7.3
+ - pkgconfig-style deps
+ - more kde-baseapps Provides
  
 -* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:4.7.2-3
 -- Rebuilt for glibc bug#747377
 -
  * Sat Oct 08 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-2
  - rebase folderview/rename patch (kde#270414)