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

[Rex Dieter]

commit bd58ac3dfe6a13c8f248bdcb65fe176da449f5bd
Merge: 6360fa0 84d0082
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:06:53 2012 -0500

    Merge branch 'f18' into f17

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