Conflicts:

	master/bt5/vifib_data_simulation/bt/revision

Message was: <ERP5Type.ConsistencyMessage for PropertyTypeValidity on
    web_site_module/hosting (message: Attribute layout_additional_css should be
    of type string but is of type <type 'tuple'>)>

Conflicts:

	master/bt5/vifib_erp5/bt/revision

Conflicts:

	master/bt5/vifib_erp5/bt/revision

Something wrong appened at previous merge to master. Cleaning.

Conflicts:
	master/bt5/vifib_web_ui_test/PathTemplateItem/portal_tests/vifib_web_zuite/TestKVM.xml
	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test.xml
	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test/Zuite_vifib_instanciation_macro_library.xml
	master/bt5/vifib_web_ui_test/bt/revision

Warning: if you thought that Romain's hack was dirty, this
is worse. Anyway, this could suffer from having several
slave instance with the same title. Be aware.

Conflicts:

	master/bt5/vifib_slap/bt/revision

Do not scatter so much between Business Templates portal type definitions.

This reverts commit ddeaf310.

Note: Always use pyflakes.

Do it litearally as otherwise it would require or monkeypatching Sequence.

Even more: some test might generate inconsistent objects, so such approach
will give flexibility.

But keep simple assertion.

WARNING: this is an quick ugly hack to not block developper.
The clean fix is to swith to the rest API defined in:
http://packages.python.org/slapos.core/

Warning: if you thought that Romain's hack was dirty, this
is worse. Anyway, this could suffer from having several
slave instance with the same title. Be aware.

Conflicts:

	master/bt5/vifib_slap/bt/revision

Do not scatter so much between Business Templates portal type definitions.

This reverts commit ddeaf310.