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

[Rex Dieter]

commit d7d103c93ac515c133d5d273c165ac6681ba451b
Merge: 58768d6 f85e356
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:50:42 2013 -0600

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

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