[ksnapshot/f17: 4/4] Merge branch 'f18' into f17

[Rex Dieter]

commit 744c053891f1f5b0866e51a93459f372aacebb4b
Merge: c684d0e 862d7b1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:06:14 2012 -0500

    Merge branch 'f18' into f17

 .gitignore              |    1 +
 ksnapshot-libkipi.patch |   37 +++++++++++++++++++++++++++++++++++++
 ksnapshot.spec          |   13 ++++++++++++-
 sources                 |    2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
---