Conflicts:
	products/ERP5/Document/BusinessTemplate.py
	products/ERP5/interfaces/transformation.py
	products/ERP5/tests/testERP5Interfaces.py
	products/ERP5SyncML/SynchronizationTool.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/portal_types@29495 20353a03-c40f-0410-a6d1-a30d3c3de9de