[kdebase-workspace/f14: 3/3] Merge branch 'f14' of ssh://pkgs.fedoraproject.org/kdebase-workspace into f14

[Kevin Kofler]

commit 2d6d8f0f153447e694cdf52f2d111eaa35460fee
Merge: 1cae516 15f8b6e
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Aug 13 00:19:05 2011 +0200

    Merge branch 'f14' of ssh://pkgs.fedoraproject.org/kdebase-workspace into f14

 kdebase-workspace-4.7.0-kde#278206.patch |   14 ++++++++++++++
 kdebase-workspace.spec                   |   10 +++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---