[kmix/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit 008363412f200060099eab85a1287cf8143b4e87
Merge: aa3e7bb 8ea295e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:38:57 2013 -0600

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

 .gitignore |    6 +-----
 kmix.spec  |   21 ++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)
---