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

[Rex Dieter]

commit e43dd665a84c95a7163399d6d00ed47e4aa6481f
Merge: ca67793 3bdf3fd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:05:04 2012 -0500

    Merge branch 'master' into f16

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