[smokegen/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit bd9942b05dc31e2e8379ef70ff4f3928e5ed8d14
Merge: 316c384 4420a82
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Sep 4 21:59:43 2013 -0500

    Merge branch 'master' into f19

 .gitignore    |    8 +++++---
 smokegen.spec |   17 ++++++++++++++++-
 sources       |    2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)
---