commit 5f96e18ae0d9eaf2db5f608d0fd25bec5b2f37f0 Merge: 8bf99f0 fb61058 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 08:50:02 2013 -0600 Merge branch 'f18' into f17 ---