tree bf6b7b352e8a7a9e5bdeae4a087ca035b8b045db
parent 87a56d538026eb3d0bdeaa8e9823824a53d75e65
parent e33950d1c2855f0398f569a21687e34329a23073
author Jacques Le Roux <jleroux@apache.org> 1387795074 +0000
committer Jacques Le Roux <jleroux@apache.org> 1387795074 +0000

Roughly merges trunk HEAD in order to later merge in jackrabbit20120501 branch

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