[kross-interpreters/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 3f4d0f157274dec991fefc0b1f87adc3c994c60e
Merge: 427f83c b066c02
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:30:48 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kross-interpreters.spec
    	sources

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