[step/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit c9bad2c654154fb2d9c9756022c24877548b2043
Merge: 453c343 7e15521
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:55:48 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	sources
    	step.spec

 .gitignore |    3 +--
 sources    |    2 +-
 step.spec  |   34 +++++++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 8 deletions(-)
---