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

[Than Ngo]

commit 38c1c8d92380aa6f88bb2c1a3c77438685efb22c
Merge: 96ffe2e 9e1a32e
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:35:09 2012 +0100

    Merge branch 'f18' into f17

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