Merge pull request #1619 from xtuple/master
authorGreg Pazo <gpazo@xtuple.com>
Wed, 25 Jun 2014 20:53:41 +0000 (16:53 -0400)
committerGreg Pazo <gpazo@xtuple.com>
Wed, 25 Jun 2014 20:53:41 +0000 (16:53 -0400)
woz from master


Trivial merge