Merge remote-tracking branch 'XTUPLE/4_7_x' into 24672
authorGreg Pazo <gpazo@xtuple.com>
Thu, 2 Oct 2014 18:27:32 +0000 (14:27 -0400)
committerGreg Pazo <gpazo@xtuple.com>
Thu, 2 Oct 2014 18:27:32 +0000 (14:27 -0400)

Trivial merge