tree a6056c89f8ced34e9707922feb59f9be2c2552cd
parent cb756656d04a5c396d6b8b94f1cf8871a84f7451
parent 31d9ba09e6c64298af3e5961c42167d8275f67da
author Erwan de Ferrieres <erwan@apache.org> 1332795362 +0000
committer Erwan de Ferrieres <erwan@apache.org> 1332795362 +0000

Merging 1210493:1305499 to keep updated from trunk

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