commit 1a82680ae16d5860bbb48ec4e8338fdcaac53e1e Merge: 10b94d4 b744d97 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 10:24:27 2013 -0600 Merge branch 'f18' ---