Conflicts:
	slapos/recipe/erp5/__init__.py
	slapos/recipe/erp5/template/initmysql.sql.in
	slapos/recipe/erp5/template/mysql-init-database.sql.in
	slapos/recipe/generic_mysql/template/initmysql.sql.in
	software/erp5/instance.cfg
	software/erp5/software.cfg