commit 0c656e51cec912ac6e6f6f833c3fe72d8335ee5a Merge: 6de731c fa1f6ba Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 09:18:57 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ kdf.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) ---