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

[Rex Dieter]

commit 6555de32cbbd48a57ebbb82594f75323c7bdfca1
Merge: 5d85be8 a552310
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 22 10:04:55 2011 -0500

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

 kdesdk.spec |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---