commit cd49adee34318c1b2853597d2aac540feacff606 Merge: 0c348ed 7d3d4d9 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 08:52:18 2013 -0600 Merge branch 'f18' into f17 ---