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