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

[Rex Dieter]

commit 92aa277a864c38b23f8bf36a1854a7f81137c835
Merge: 424a282 fe9362e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 20 16:06:27 2010 -0500

    Merge branch 'master' into f14

 kdebase-workspace-4.5.0-krunner_history.patch |   22 ++++++++++++++++++++++
 kdebase-workspace.spec                        |    8 +++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---