Conflicts:
	transforms/safe_html.py

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