Conflicts:
	product/ERP5/bootstrap/erp5_core/bt/revision
	product/Zelenium/selenium/core/scripts/htmlutils.js
	product/Zelenium/selenium/core/scripts/selenium-api.js
	product/Zelenium/selenium/core/scripts/selenium-browserbot.js