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

[Rex Dieter]

commit bcd9bed9726128f7fc5c69a91f53ef8a23fbdfb1
Merge: 0b51c72 ec2ac28
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:44:33 2013 -0500

    Merge branch 'master' into f19

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