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

[Rex Dieter]

commit be5dcaf69cd07ca0642dfc792404a6187458f501
Merge: de4fc62 a726ab7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 16 13:53:30 2011 -0500

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

 kdelibs-4.6.80-kconfigxt-qt48.patch |   33 +++++++++++++++++++++++++++++++++
 kdelibs.spec                        |    9 ++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---