[libksane/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit bbd5a48cda3e5e702480f676a9ff165101fbc253
Merge: cb2a87c 71d5024
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 19:11:50 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	libksane.spec
    	sources

 .gitignore    |    3 +--
 libksane.spec |   30 ++++++++++++++++++++++++++----
 sources       |    2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)
---