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

[Rex Dieter]

commit 7849211a46373934d36babacdb399c562c6286ac
Merge: e6559e8 db1393f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:01:37 2012 -0500

    Merge branch 'f18' into f17

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