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

[Rex Dieter]

commit 656586bc0aaab761da0b5a8d1a2450b864e45645
Merge: 2eebd8b 6bd63b1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:43:48 2012 -0600

    Merge branch 'f18' into f17

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