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

[Than Ngo]

commit 780dfe6bf6cb2548acd0aa3bc807df42cddcd3c5
Merge: e34eb56 da47184
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:49:31 2012 +0100

    Merge branch 'f18' into f17

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