[kdebase-workspace/f13/master: 6/6] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 34ccef44f3739622513da11153fe080b19e111a6
Merge: 13932e9 4c533b6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 18:29:44 2010 -0600

    Merge remote branch 'origin/master' into f13/master

 .gitignore                                      |    1 +
 kdebase-workspace-4.2.85-ck-shutdown.patch      |   63 -----
 kdebase-workspace-4.3.95-ck-shutdown.patch      |   65 -----
 kdebase-workspace-4.4.0-classicmenu-games.patch |   42 ---
 kdebase-workspace-4.5.2-ck-shutdown.patch       |  310 +++++++++++++++++++++++
 kdebase-workspace-4.5.2-startkde_zenity.patch   |   70 +++++
 kdebase-workspace.spec                          |   43 ++-
 sources                                         |    2 +-
 8 files changed, 410 insertions(+), 186 deletions(-)
---