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

[Rex Dieter]

commit 80240d663727ec5f07977945342636615d8ee82a
Merge: 09585b1 a6dfc05
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:56:05 2013 -0600

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

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