Merge branch 'xtuple'
authorJohn Rogelstad <john@xtuple.com>
Thu, 19 Dec 2013 13:46:47 +0000 (08:46 -0500)
committerJohn Rogelstad <john@xtuple.com>
Thu, 19 Dec 2013 13:46:47 +0000 (08:46 -0500)

Trivial merge