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

[Rex Dieter]

commit ca677933b2710ce66d2ed52f3483f676e67655f9
Merge: a297f81 9ad2cc4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:48:50 2012 -0600

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

 .gitignore       |    3 +--
 ksaneplugin.spec |   29 +++++++++++++++++++++++++----
 sources          |    2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
---