[step/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 442b5a8b69b1df7068b308732599d1721da5c9fa
Merge: c9bad2c c27b59c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:07:29 2012 -0500

    Merge branch 'master' into f16

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