[kdf/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 444756c271b55c78a62d98fe7160ea08cc55cd9b
Merge: 2f48bd1 0c8915d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:24:30 2013 -0500

    Merge branch 'master' into f19

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