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

[Rex Dieter]

commit bad08902cfad4d2c2f773864564fab80606c1eea
Merge: 4f4aecc 9c61b2b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:45:17 2013 -0600

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

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