[kde-workspace/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 3f62b6af27d1d5fbadffbe1bb4d2f5ecc5d49f86
Merge: 5a4f04f e881332
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Apr 16 14:02:38 2013 -0500

    Merge branch 'f18' into f17
    
    Conflicts:
    	kde-workspace.spec

 kde-workspace-4.10.2-kdm-logind-multiseat.patch    |  331 ++++++++++++++++++++
 ...space-4.10.2-systray_org.kde.ktp-presence.patch |   14 +
 kde-workspace-4.8.0-systray_ktp_presence.patch     |   14 -
 kde-workspace.spec                                 |   23 +-
 4 files changed, 362 insertions(+), 20 deletions(-)
---