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

[Rex Dieter]

commit fd0fa1f9d1237b9f26e8f8abadd62230652782a1
Merge: ad251f1 f304bc8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:36:51 2013 -0600

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

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