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

[Daniel Vrátil]

commit 528e48c1c682468e99f300f61fc6ff5d67201b93
Merge: a95f2f9 dcc63f5
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Jun 17 10:04:52 2013 +0200

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

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