[kde-workspace/f18: 4/4] Merge branch 'master' into f18

[Rex Dieter]

commit 4c2617b98c5e1ab10ae891c3c6c04b8d4f74e174
Merge: 357526c 3be6220
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 3 15:41:05 2012 -0600

    Merge branch 'master' into f18

 .gitignore                                     |    1 +
 kde-workspace-4.9.2-systemd-switch-user2.patch |   19 +++++++++++++++++++
 kde-workspace.spec                             |   12 ++++++++++--
 sources                                        |    2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)
---