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

[Rex Dieter]

commit fa34614c8411668643bc6980360ba11ff547a49d
Merge: fc340bd 23bed69
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:27:28 2012 -0500

    Merge branch 'f17' into f16

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