[smokegen/f16: 10/10] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 93568c282ae61f9a0ae027cea81e8cb3318f4a74
Merge: b5b664f 68afc0e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 17:35:19 2012 -0600

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

 .gitignore                 |    2 +-
 smokegen-4.7.0-crash.patch |   13 -------------
 smokegen.spec              |   36 +++++++++++++++++++++++++++++-------
 sources                    |    2 +-
 4 files changed, 31 insertions(+), 22 deletions(-)
---