Merge remote-tracking branch 'XTUPLE/4_5_x' into 4_5_x
authorgaryhgohoos <gary@xtuple.com>
Mon, 5 May 2014 17:09:45 +0000 (13:09 -0400)
committergaryhgohoos <gary@xtuple.com>
Mon, 5 May 2014 17:09:45 +0000 (13:09 -0400)

Trivial merge