--- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserver.cpp	Fri Feb 19 23:07:29 2010 +0200
+++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserver.cpp	Fri Mar 12 15:43:54 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-
+#include <mw/memorymanager.h>
 #include <liwcommon.h>
 #include <ecom/ecom.h>
 #include <fbs.h>
@@ -387,7 +387,12 @@
 //
 TInt E32Main()
     {
-    return CCPServer::ThreadStart( );
+    RAllocator* iAllocator = MemoryManager::SwitchToFastAllocator();
+    
+    //Get the return value (needs to call CloseFastAllocator() before return)
+    TInt iReturnValue = CCPServer::ThreadStart( );
+    MemoryManager::CloseFastAllocator(iAllocator);
+    return iReturnValue;  
     }
 
 // End of File