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

[Rex Dieter]

commit 864e4b1ba7fd7c30f9ec25996f6db7d9b5b08b7a
Merge: d07d576 02368fa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 18:35:00 2013 -0600

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

 .gitignore  |    6 +-----
 kimono.spec |   21 ++++++++++++++++++---
 sources     |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)
---