Conflicts:

	setup.py

Mydumper generate doc with installation, that's why it depends on Sphinx
python egg.

This is a dirty buildout. But it is the only way to have proper mydumper
installation.

Conflicts:
	software/erp5/software.cfg

By default, all components are located on the same computer.

This will ease portal templates configuration.

Conflicts:
	software/erp5/software.cfg

This was introduced by mistake in bddd1eb6

Put repository in this order or the configuration is not usable.

This is a hack to detect any problem with current MySQL usage

It eases the review with git.