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

[Rex Dieter]

commit f41c68ce8a09b6880a282a4830fa655bef171bcc
Merge: 44b0bc4 f34ece5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:31:52 2012 -0500

    Merge branch 'f17' into f16

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