Merge branch 'xtuple46'
authorjgunderson <jgunderson@erpbisolutions.com>
Wed, 9 Jul 2014 20:26:06 +0000 (16:26 -0400)
committerjgunderson <jgunderson@erpbisolutions.com>
Wed, 9 Jul 2014 20:26:06 +0000 (16:26 -0400)

Trivial merge