[ksaneplugin/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 3640a0933472cbfb6fe1a849e252ed35aa0e07de
Merge: cc56b8a cfa1cb1
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:40:53 2012 +0100

    Merge branch 'f18' into f17

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