Merge branch 'master' into simplify_eval
authorGary Linscott <glinscott@gmail.com>
Mon, 11 Feb 2013 15:26:25 +0000 (10:26 -0500)
committerGary Linscott <glinscott@gmail.com>
Mon, 11 Feb 2013 15:26:25 +0000 (10:26 -0500)

Trivial merge