[kmousetool/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit ec2a7d85a5d8c025d2fbcff5931483bf82623fff
Merge: 6ed646a c8e9cb9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:38:20 2013 -0600

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

 .gitignore      |    7 +------
 kmousetool.spec |   21 ++++++++++++++++++---
 sources         |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---