Conflicts:
	products/ERP5/Document/RoleDefinition.py
	products/ERP5Type/Tool/MemcachedTool.py
	products/ERP5Type/__init__.py

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