Merge fix for bug 2631 (included in recent delivery) and workaround for bug 2620.
EXPORTS
_Z9LibEntryLv @ 1 NONAME
_ZN12TCDSYMessage14SetReturnDataLEPK6TDesC8 @ 2 NONAME
_ZN12TCDSYMessageC1EmmPK6TDesC8 @ 3 NONAME
_ZN12TCDSYMessageC1EmmPK6TDesC8m @ 4 NONAME
_ZN12TCDSYMessageC2EmmPK6TDesC8 @ 5 NONAME
_ZN12TCDSYMessageC2EmmPK6TDesC8m @ 6 NONAME
_ZN12TCDSYMessageD0Ev @ 7 NONAME
_ZN12TCDSYMessageD1Ev @ 8 NONAME
_ZN12TCDSYMessageD2Ev @ 9 NONAME
_ZN15CCDSYController14ExpireMessageLER12TCDSYMessage @ 10 NONAME
_ZN15CCDSYController15ProcessMessageLER12TCDSYMessage @ 11 NONAME
_ZN15CCDSYController19GetNewTransactionIDEv @ 12 NONAME
_ZN15CCDSYController21RegisterServiceLogicLEmmP17MCDSYServiceLogic @ 13 NONAME
_ZN15CCDSYController21RegisterServiceLogicLEmmmP17MCDSYServiceLogic @ 14 NONAME
_ZN15CCDSYController22UnregisterServiceLogicEmmPK17MCDSYServiceLogic @ 15 NONAME
_ZN15CCDSYController22UnregisterServiceLogicEmmmPK17MCDSYServiceLogic @ 16 NONAME