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

[Rex Dieter]

commit fa1f6ba9aeeab5415ca75e1d5942cae9dc2d3fce
Merge: 5e45b65 7de668b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:24:43 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdf.spec
    	sources

 .gitignore |    7 +------
 kdf.spec   |   21 ++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---