[kdebase-workspace/f15: 2/2] Merge branch 'master' into f15

[Rex Dieter]

commit f5f8673b9843dce81f29b4529af283a1e9b301bb
Merge: 61132bd 775ec25
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed May 25 16:59:03 2011 -0500

    Merge branch 'master' into f15

 kdebase-workspace.spec                 |    8 ++++++-
 kdebase-workspce-4.6.3-kde272666.patch |   38 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletions(-)
---