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

[Than Ngo]

commit f491f2b4ff6609a60118a9c6e67f0b73305a6b3d
Merge: 656586b 4cc1aea
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:42:45 2012 +0100

    Merge branch 'f18' into f17

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