commit 23efbfd87fc121ed152bf0493e2d14f50dddc36f Merge: d218483 5f77212 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Apr 16 14:10:40 2013 -0500 Merge branch 'f18' into f17 ---