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

[Rex Dieter]

commit c5b716f291795f69a62cd40fa09cccf2ed5cd6f5
Merge: cb94d32 da32a5e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 13:14:37 2012 -0500

    Merge branch 'f18' into f17

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