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

[Rex Dieter]

commit b9b592b0f774ef63f496f57ab6bd0df8e52270ae
Merge: f491f2b 8e95a58
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:55:24 2012 -0600

    Merge branch 'f18' into f17

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