[libkscreen/f17: 3/3] Merge branch 'master' into f17

[Daniel Vrátil]

commit 4357be61b756c2c8d41de73cb565b7d530874b93
Merge: 24fa499 dcc63f5
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Jun 17 10:06:34 2013 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	libkscreen.spec
    	sources

 .gitignore      |    1 +
 libkscreen.spec |    9 ++++++---
 sources         |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---