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

[Rex Dieter]

commit bacbb2c974696f84d26374546a6c729f444e6d8e
Merge: 3d47329 cc2a665
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:05:09 2013 -0600

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

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