commit 8f1602463d431196e233f78534419ddb82e302a8 Merge: 8a99bc6 864e4b1 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 07:31:17 2013 -0600 Merge branch 'f18' into f17 .gitignore | 6 +----- kimono.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) ---