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

[Rex Dieter]

commit 33b91cbf8fb945af09a2168ccd6f8dc00ebebd48
Merge: 3526771 5d0dcec
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:22:03 2013 -0600

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

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