[step/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 88fc78ebc338e02ef1387ead2d35a0d8962e2ad2
Merge: 720750a bad0890
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 10:26:36 2013 -0600

    Merge branch 'f18' into f17

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