merged faisal's branch of EGL_MERGE on top of all of the dead heads of Jose. This makes Faisal's changes the 'tip' of EGL_MERGE again. No changes.
EXPORTS
_ZN26CWsGraphicTestSurfaceMulti10ConstructLE4TUidRK21TSurfaceConfigurationjPK6TArrayIjE @ 1 NONAME
_ZN26CWsGraphicTestSurfaceMulti10ConstructLERK12TWsGraphicIdRK21TSurfaceConfigurationjPK6TArrayIjE @ 2 NONAME
_ZN26CWsGraphicTestSurfaceMulti10ConstructLERK21TSurfaceConfigurationjPK6TArrayIjE @ 3 NONAME
_ZN26CWsGraphicTestSurfaceMulti36CWsGraphicTestSurfaceMulti_Reserved1Ev @ 4 NONAME
_ZN26CWsGraphicTestSurfaceMulti36CWsGraphicTestSurfaceMulti_Reserved2Ev @ 5 NONAME
_ZN26CWsGraphicTestSurfaceMulti36CWsGraphicTestSurfaceMulti_Reserved3Ev @ 6 NONAME
_ZN26CWsGraphicTestSurfaceMulti4NewLE4TUidRK21TSurfaceConfigurationjPK6TArrayIjE @ 7 NONAME
_ZN26CWsGraphicTestSurfaceMulti4NewLERK12TWsGraphicIdRK21TSurfaceConfigurationjPK6TArrayIjE @ 8 NONAME
_ZN26CWsGraphicTestSurfaceMulti4NewLERK21TSurfaceConfigurationjPK6TArrayIjE @ 9 NONAME
_ZN26CWsGraphicTestSurfaceMultiC1Ev @ 10 NONAME
_ZN26CWsGraphicTestSurfaceMultiC2Ev @ 11 NONAME
_ZN26CWsGraphicTestSurfaceMultiD0Ev @ 12 NONAME
_ZN26CWsGraphicTestSurfaceMultiD1Ev @ 13 NONAME
_ZN26CWsGraphicTestSurfaceMultiD2Ev @ 14 NONAME
_ZTI26CWsGraphicTestSurfaceMulti @ 15 NONAME
_ZTV26CWsGraphicTestSurfaceMulti @ 16 NONAME