[kimono/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 8a99bc61e0b77a60dd828a7ecae354fa92521ca3
Merge: 3cc0ba3 d07d576
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:27:54 2012 -0600

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 kimono.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---