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

[Rex Dieter]

commit daad11bc95255aaedec5e3a4b0d0ca8834966955
Merge: acf2827 ea713c9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:46:50 2013 -0500

    Merge branch 'master' into f19

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