Merge pull request #1553 from xtuple/4_5_x
authorLinda Nichols <lynnaloo@gmail.com>
Tue, 3 Jun 2014 19:27:03 +0000 (15:27 -0400)
committerLinda Nichols <lynnaloo@gmail.com>
Tue, 3 Jun 2014 19:27:03 +0000 (15:27 -0400)
Merge 4_5_x into 4_6_x


Trivial merge