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

[Rex Dieter]

commit 4b2b8cb51038718fab142c5e600a3f7b9781ba95
Merge: 24a2af1 e4adcc5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:29:34 2012 -0500

    Merge branch 'f17' into f16

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