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

[Rex Dieter]

commit e34eb56ce7d311a577ed222e19b15faab7d1ec48
Merge: 40747c6 e5b0443
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:45:03 2012 -0600

    Merge branch 'f18' into f17

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