[kscreen/f17: 6/6] Merge branch 'f18' into f17

[Rex Dieter]

commit 0fc9fa46e93bfc82385b5aeff3a96d5003195866
Merge: 17d34c6 6baf86e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 28 13:45:05 2013 -0600

    Merge branch 'f18' into f17

 kscreen.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---