moved the emma_ogre branch into branches
Authored by: cmarrin 2007-06-03
Parent: [r139]
Child: [r141]