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

[Daniel Vrátil]

commit 17d34c6412667503d18009c95de820d83526d369
Merge: a6a4460 daa9278
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Jan 24 16:51:19 2013 +0100

    Merge branch 'f18' into f17

 kscreen.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---