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

[Rex Dieter]

commit 6cd6d2e629dae7feecf87c660ee7631a9fc77a7a
Merge: f41c68c ed821b6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 10:02:52 2012 -0500

    Merge branch 'f17' into f16

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