[smokeqt/f18: 11/11] Merge branch 'master' into f18

[Rex Dieter]

commit 1a57bf3fa6ea8cd910eb930c7c1640ee867b3afc
Merge: d0cc52c aaf0d20
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 14:41:25 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	smokeqt.spec
    	sources

 .gitignore   |    7 +------
 smokeqt.spec |   27 ++++++++++++++++++++++++---
 sources      |    2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)
---