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

[Rex Dieter]

commit a0303d00884c087575711f8e0bf0a0eb27aae7f0
Merge: 92aa277 16eb569
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 12:29:37 2010 -0500

    Merge branch 'master' into f14

 .gitignore                                         |    2 +-
 kdebase-workspace-4.5.0-krunner_history.patch      |   22 ----------------
 kdebase-workspace-4.5.0-startkde-malloc.patch      |   22 ----------------
 ...> kdebase-workspace-4.5.1-redhat_startkde.patch |   20 +++++++--------
 kdebase-workspace.spec                             |   26 ++++++++++----------
 sources                                            |    2 +-
 6 files changed, 24 insertions(+), 70 deletions(-)
---