commit b830ed799745ef41ad747e8927a288840d376a20 Merge: f92d211 bacbb2c Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 10:23:47 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ ktouch.spec | 22 +++++++++++++++++++--- sources | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) ---