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

[Rex Dieter]

commit 720750a7c9510b33e02eb4caa96e7ef631656fbc
Merge: 780dfe6 4f4aecc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:56:44 2012 -0600

    Merge branch 'f18' into f17

 .gitignore |    1 +
 sources    |    2 +-
 step.spec  |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---