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

[Rex Dieter]

commit fc340bd76b4f8462c82c2e909ebf812e3e251e9d
Merge: 4e0c0f3 485a836
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:23:11 2012 -0500

    Merge branch 'f17' into f16

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