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

[Rex Dieter]

commit 26160d8c54b6aef1acb7e0874f24d19ff5f78b8f
Merge: f0e0782 a49cceb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 28 11:09:32 2013 -0600

    Merge branch 'f18' into f17

 kde-workspace.spec |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)
---