[kwallet/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 2fa55407861f1c9a6edfa4ace9b9d292c582f6e4
Merge: b9b592b 5204f6e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 10:24:47 2013 -0600

    Merge branch 'f18' into f17

 .gitignore   |    7 +------
 kwallet.spec |   21 ++++++++++++++++++---
 sources      |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---