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

[Rex Dieter]

commit e88133227eb4708ff042a12e7abbb8425a0697c7
Merge: e2e6f5f 840e134
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Apr 16 14:01:45 2013 -0500

    Merge branch 'f19' into f18
    
    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(-)
---