Conflicts:
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_localBuild.xml
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/confirm.xml
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/start.xml
	bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Alarm_activateFixConsistency.xml
	bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/scripts/Delivery_Build.xml
	bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
	bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_updateCausalityState.xml
	bt5/erp5_base/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow/interactions/calculate_causality.xml
	bt5/erp5_base/bt/revision
	bt5/erp5_computer_immobilisation/SkinTemplateItem/portal_skins/erp5_computer_immobilisation/Computer_applyComputerModel.xml
	bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
	bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml
	bt5/erp5_invoicing/bt/revision
	bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
	bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/Alarm_updateOpenOrderSimulation.xml
	bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrderLine_updateSimulation.xml
	bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrder_updateSimulation.xml
	bt5/erp5_open_trade/bt/revision
	product/CMFActivity/skins/activity/SQLBase_reserveMessageList.zsql
	product/ERP5/Document/Delivery.py
	product/ERP5/Tool/CertificateAuthorityTool.py
	product/ERP5/bootstrap/erp5_core/bt/revision
	product/ERP5Configurator/Tool/ConfiguratorTool.py
	product/ERP5Type/ERP5Type.py