Merge remote-tracking branch 'XTUPLE/20254-global' into 20254-global
authorBen Thompson <ben@xtuple.com>
Wed, 22 May 2013 16:37:43 +0000 (12:37 -0400)
committerBen Thompson <ben@xtuple.com>
Wed, 22 May 2013 16:37:43 +0000 (12:37 -0400)

Trivial merge