[kdelibs/f14: 2/2] Merge remote-tracking branch 'origin/f15' into f14

[Rex Dieter]

commit 52d1fc737194b3ee8100ded811d173b1b8c665b8
Merge: c4b64c1 41f7295
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:07:47 2011 -0500

    Merge remote-tracking branch 'origin/f15' into f14

 .gitignore                          |    4 +---
 kdelibs-4.6.80-kconfigxt-qt48.patch |   33 ---------------------------------
 kdelibs.spec                        |   11 +++++------
 sources                             |    2 +-
 4 files changed, 7 insertions(+), 43 deletions(-)
---