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
_ZN7TestGdi10ConstructLEP13CBitmapDeviceP9CFbsBitGcR6TDes16 @ 1 NONAME
_ZN7TestGdi4TestEv @ 2 NONAME
_ZN7TestGdi9ConstructEP13CBitmapDeviceP9CFbsBitGcR6TDes16 @ 3 NONAME
_ZN7TestGdiC1Ev @ 4 NONAME
_ZN7TestGdiC2Ev @ 5 NONAME