Conflicts:
	stack/erp5/buildout.cfg

Should still be sufficient for ERP5 unit tests: largest test uses 3 DB, and
we want to run 10 tests in parallel.

vincent: Minor fixes. Move branch switch to a separate commit.

older pod2man does not recognise --errors.
anyway we should just skip make in doc directory.

Buildout output is less scary this way.

Buildout output is less scary this way.

recent pod2man version does not work with wget documentation and make the whole compilation failed