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

[Rex Dieter]

commit 40747c681ccb55a1f1c33e35944a38976bb02095
Merge: 650b19d fd973f1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:08:20 2012 -0500

    Merge branch 'f18' into f17

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