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

[Rex Dieter]

commit 3ab2c4de481f76d1e8668302db9fc50ce141a70b
Merge: bbd5a48 e864635
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:54:32 2012 -0500

    Merge branch 'master' into f16

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