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

[Rex Dieter]

commit 8360cd9fd2ccee25ccec24fa5bde124dd95454b2
Merge: dae7ffb ed299a5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:01:16 2013 -0600

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

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