[ktouch/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit 6360fa093918cb528273b7467acaa6280c63dbb0
Merge: e4adcc5 6ade932
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:47:53 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	ktouch.spec
    	sources

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