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

[Rex Dieter]

commit c1ac955b7b84c213a5992d6f65be2be9e213938d
Merge: 26a9122 0a2071b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 16:36:57 2012 -0600

    Merge branch 'f18' into f17

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