[kwallet/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 5204f6ee9d9887f6e574f5a82b1c74e273721887
Merge: 8e95a58 b94e952
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:59:05 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kwallet.spec
    	sources

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