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

[Rex Dieter]

commit 13932e9a860b3caebd00270cbc4e72aead4c9f7d
Merge: f0970fe eaebc14
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 21:21:17 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdebase-workspace-4.4.2-kdm_plymouth.patch
    	kdebase-workspace.spec
    	sources

 .gitignore                                         |    2 +-
 kdebase-workspace-4.3.75-rootprivs.patch           |   54 --
 kdebase-workspace-4.3.75-show_systemsettings.patch |   26 -
 ...workspace-4.3.80-xsession_errors_O_APPEND.patch |   12 -
 kdebase-workspace-4.3.95-brightness_keys.patch     |  418 ----------------
 ...4.3.98-battery-plasmoid-showremainingtime.patch |   16 -
 kdebase-workspace-4.4.2-kdm_plymouth.patch         |   55 ---
 kdebase-workspace-4.4.2-kdm_plymouth081.patch      |  177 -------
 ...4.4.80-battery-plasmoid-showremainingtime.patch |   16 +
 kdebase-workspace-4.4.90-rootprivs.patch           |   47 ++
 kdebase-workspace-4.4.92-kdm_plymouth.patch        |   55 +++
 kdebase-workspace-4.4.92-kdm_plymouth081.patch     |  165 +++++++
 ...pace-4.4.92-systemsettings_onlyshowin_kde.patch |    9 +
 ...workspace-4.4.92-xsession_errors_O_APPEND.patch |   12 +
 ...=> kdebase-workspace-4.5.0-plasma-konsole.patch |   22 +-
 ...ase-workspace-4.5.1-kfontview_dt_validate.patch |   12 +
 ...> kdebase-workspace-4.5.1-redhat_startkde.patch |   16 +-
 kdebase-workspace-4.5.2-krandrtray_backport.patch  |  508 ++++++++++++++++++++
 ...5.2-kwin_unredirect_fullscreen_windows_ui.patch |   93 ++++
 kdebase-workspace.spec                             |  233 +++++++---
 sources                                            |    2 +-
 21 files changed, 1102 insertions(+), 848 deletions(-)
---