Merge remote-tracking branch 'xtuple/master' into 20678
authorjulesstp <julianmcarlin@gmail.com>
Fri, 16 Aug 2013 16:14:52 +0000 (10:14 -0600)
committerjulesstp <julianmcarlin@gmail.com>
Fri, 16 Aug 2013 16:14:52 +0000 (10:14 -0600)

Trivial merge