Conflicts:
	component/apache-perl/buildout.cfg
	component/postgresql/buildout.cfg
	software/mioga/instance.cfg
	software/mioga/software.cfg