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

[Rex Dieter]

commit 4e0c0f3ae2fdbd7ba47cdffc7b6755891a6cf53a
Merge: e43dd66 2611af3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 23:02:56 2012 -0500

    Merge branch 'master' into f16

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