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

[Rex Dieter]

commit 8875e759778f836383b9001159592b6cc80c4cea
Merge: 9837fae 44de486
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:42:15 2012 -0500

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

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