[klettres/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit f5b4e816a1ad3b968c3be39b625c0c6cf6fcf51b
Merge: 71127e8 fdbf53a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:49:56 2013 -0600

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

 .gitignore    |    7 +------
 klettres.spec |   23 +++++++++++++++++++----
 sources       |    2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)
---