merge 4.6.0-beta into master
authorGil Moskowitz <gmoskowitz@xtuple.com>
Mon, 28 Jul 2014 20:45:23 +0000 (16:45 -0400)
committerGil Moskowitz <gmoskowitz@xtuple.com>
Mon, 28 Jul 2014 20:45:23 +0000 (16:45 -0400)

Trivial merge