Conflicts:
	bt5/erp5_syncml/bt/revision
	bt5/erp5_syncml_test_data/bt/revision
	bt5/erp5_tiosafe_core/bt/template_extension_id_list
	product/ERP5Type/dynamic/component_package.py