Conflicts:
	component/apache/buildout.cfg
	component/groonga/buildout.cfg
	component/imagemagick/buildout.cfg
	component/mysql-5.1/buildout.cfg
	component/ncurses/buildout.cfg
	slapos/recipe/erp5/template/haproxy.cfg.in
	software/erp5/software.cfg
	software/vifib/software.cfg
	stack/erp5.cfg