commit b7ad247fbb4ab59960d69530995a9712e6996671 Merge: 5b492c3 e4a8981 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Apr 16 14:10:20 2013 -0500 Merge branch 'master' into f19 ---