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

[Rex Dieter]

commit 56ced06dc1bcfe9279c786fa2c989caf09d014f5
Merge: 7c1c730 0c59701
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:05:44 2012 -0500

    Merge branch 'f18' into f17

 .gitignore       |    1 +
 ksaneplugin.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---