[ktimer/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 654b948fcc1ee275b081268dc0f6f04024323dba
Merge: 23f8160 cce9ef3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 10:19:15 2013 -0600

    Merge branch 'f18' into f17

 .gitignore  |    7 +------
 ktimer.spec |   21 ++++++++++++++++++---
 sources     |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---