[kig/f18: 9/9] Merge branch 'master' into f18

[Rex Dieter]

commit e95f7454983c0118fc50b0bf4695bbe5032f3f7b
Merge: 05ec033 706fa7b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:52:14 2013 -0600

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

 .gitignore |    7 +------
 kig.spec   |   27 ++++++++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)
---