[kwallet/f19: 9/9] Merge branch 'master' into f19

[Rex Dieter]

commit a53231e55029a8439d296d7e5163289ee4fc4adc
Merge: b6fbc04 50ecc3c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:49:12 2013 -0500

    Merge branch 'master' into f19

 .gitignore   |    5 +++++
 kwallet.spec |   22 +++++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)
---