commit fd5715ca34b914cb7cc14b7610acb6be6862f600 Merge: 99e98dc 20de9c9 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 08:40:49 2013 -0600 Merge branch 'f18' into f17 ---