Merge branch '23580mql' of https://github.com/gilmoskowitz/xtuple into 23580mql
authorGil Moskowitz <gilmoskowitz@acm.org>
Mon, 19 May 2014 17:00:55 +0000 (13:00 -0400)
committerGil Moskowitz <gilmoskowitz@acm.org>
Mon, 19 May 2014 17:00:55 +0000 (13:00 -0400)

Trivial merge