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

[Than Ngo]

commit 26a912282a29c41463905ba437229e9c2f2a54f7
Merge: 1cdb550 41ccbc3
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:44:57 2012 +0100

    Merge branch 'f18' into f17

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