When adding items to a cross ref table it doesn't take the connection into account.
Conflicts:
	generator/lib/builder/om/PHP5ObjectBuilder.php