Backed out changeset: 43c657731fe4 (was lost the ability to resolve conflict by preferring existing resource)
Backed out changeset: 43c657731fe4 (was lost the ability to resolve conflict by preferring existing resource)

paroj/ogre,paroj/ogre,paroj/ogre,OGRECave/ogre,paroj/ogre,OGRECave/ogre,paroj/ogre,OGRECave/ogre,OGRECave/ogre,OGRECave/ogre