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

[Rex Dieter]

commit 83e17ecd3f6ca8f68fbcb6fc5dde1f422376b58d
Merge: fb81c8a 5794f8f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jul 12 09:15:57 2011 -0500

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

 kdebase-workspace-4.6.6-bug718461.patch |  161 +++++++++++++++++++++++++++++++
 kdebase-workspace.spec                  |    8 ++-
 2 files changed, 168 insertions(+), 1 deletions(-)
---