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

[Rex Dieter]

commit 24a2af1e16ae80ff2086e6d4e0aa6d66b82354c9
Merge: 34cd04c 63c3075
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:24:14 2012 -0500

    Merge branch 'f17' into f16

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