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

[Rex Dieter]

commit 2f3ff2675f46c74607b9793f7bee42f5eacff236
Merge: 24c9a37 54f4fca
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:23:38 2013 -0600

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

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