Build fix.  Some changes from trunk snuck in.
Build fix.  Some changes from trunk snuck in.

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