Conflicts:
	master/bt5/vifib_base/bt/revision
	master/bt5/vifib_erp5/bt/revision
	master/bt5/vifib_slap/bt/revision