Conflicts:
	component/apache/buildout.cfg
	component/git/buildout.cfg
	component/libreoffice-bin/buildout.cfg
	component/mariadb/buildout.cfg
	component/perl-DBD-MySQL/buildout.cfg
	component/perl/buildout.cfg
	component/stunnel/buildout.cfg
	component/xtrabackup/buildout.cfg
	component/xtrabackup/xtrabackup-1.6.2_build.patch
	setup.py
	slapos/recipe/erp5/__init__.py
	slapos/recipe/erp5/template/haproxy.cfg.in
	software/cloudooo/software.cfg
	software/erp5/software.cfg
	stack/erp5.cfg