Merge remote-tracking branch 'XTUPLE/4_5_x' into 4_5_x
authorgaryhgohoos <gary@xtuple.com>
Fri, 16 May 2014 19:51:31 +0000 (15:51 -0400)
committergaryhgohoos <gary@xtuple.com>
Fri, 16 May 2014 19:51:31 +0000 (15:51 -0400)

Trivial merge