[ktouch/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 982e73f60df18b535eab01a242f4e59248b1f5fe
Merge: 4d73fe2 896f0bb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:06:10 2012 -0500

    Merge branch 'master' into f16

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