[klickety/f19: 9/9] Merge branch 'master' into f19

[Rex Dieter]

commit 1469c6390c0bb3734fc657905ae0a0645ac6fcd8
Merge: d3ac1a1 bb33de8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:32:30 2013 -0500

    Merge branch 'master' into f19

 .gitignore    |    5 +++++
 klickety.spec |   23 ++++++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)
---