Merge pull request #1556 from xtuple/master
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Wed, 4 Jun 2014 00:04:06 +0000 (20:04 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Wed, 4 Jun 2014 00:04:06 +0000 (20:04 -0400)
merge forward master


Trivial merge