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

[Rex Dieter]

commit de594fa2de473f68ade9b653ab902e58fd80ed35
Merge: 1b5194d 6fcbfb0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Sep 4 22:54:12 2013 -0500

    Merge branch 'master' into f19

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