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

[Rex Dieter]

commit d5e61fb51bd526c3fc1478392b07a4b6ce17dd24
Merge: 9223dd4 4eca777
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:55:04 2013 -0600

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

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