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

[Rex Dieter]

commit 88b414e1dd4e94a9de258eb55d09ffbaa04670c1
Merge: 3d3f399 76a34ff
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:06:40 2012 -0500

    Merge branch 'f18' into f17

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