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

[Rex Dieter]

commit 14a28e5d0fa6ddfdad2127ffef3611c24468546b
Merge: 1b9eb56 bef3a4a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:18:41 2013 -0600

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

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