[smokegen/f17: 13/13] Merge branch 'master' into f17

[Rex Dieter]

commit 3e2d0f46395e20db67692499f438b6a9e2f3c0a8
Merge: d84a5ef d5bee4e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 15:18:02 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	smokegen.spec
    	sources

 .gitignore                   |    3 +-
 smokegen-4.8.90-qflags.patch |   87 ++++++++++++++++++++++++++++++++++++++++++
 smokegen.spec                |   45 ++++++++++++++++-----
 sources                      |    2 +-
 4 files changed, 123 insertions(+), 14 deletions(-)
---