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

[Rex Dieter]

commit 8714a8edef4a66d6be50110add7a7cc1fd8431c5
Merge: 69d2cbf 233c988
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:40:39 2013 -0600

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

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