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

[Rex Dieter]

commit fb81c8a4b431547b00505592ede522a8d66116d2
Merge: cb44453 7d05009
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jul 6 11:19:51 2011 -0500

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

 kdebase-workspace.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---