[ktouch/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 4d73fe259389d925274d9efb2f5f11ae1a050f40
Merge: e9632a5 3e4d665
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:51:55 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	ktouch.spec
    	sources

 .gitignore  |    3 +--
 ktouch.spec |   30 +++++++++++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 27 insertions(+), 8 deletions(-)
---