tree c76c2e0d8e8df6d6cbab340e7939b6d685b12dc3
parent dfb9a663ee2f366dc92af7d56f90907dcecccebb
parent b35e0de40c3419405a5b0dafef72ef705c8b88bc
author David E. Jones <jonesde@apache.org> 1269476458 +0000
committer David E. Jones <jonesde@apache.org> 1269476458 +0000

Merged from trunk up to r927237 in prep for merging into trunk

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/multitenant20100310@927238 13f79535-47bb-0310-9956-ffa450edef68