( r15620 has been reverted I will merge it again after this checkin )

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15708 20353a03-c40f-0410-a6d1-a30d3c3de9de