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

[Rex Dieter]

commit 5667fc6df026e66f496dae68594fd0a57ea4dced
Merge: 9da06a2 68af4d3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 19:29:10 2012 -0600

    Merge branch 'f18' into f17

 .gitignore         |    1 +
 kde-workspace.spec |    7 +++++--
 sources            |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---