--- a/clean/sysdefs/system_model.xml	Thu Jun 25 14:45:21 2009 +0100
+++ b/clean/sysdefs/system_model.xml	Thu Jul 02 12:40:37 2009 +0100
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Tech domain abbrevations list
-Location		lo
-OS Base Services	hb
-Multimedia		mm
-Multimedia Apps	ma
-Productivity	pr
-Personal Communications	vc
-Security		se
-User Interface		ui
-Data Communications	dc
-Device Connectivity	de
-Device Management	dm
-Runtimes and Web		rt
-Tools			to
-Operator Complementary Packages		ocp
+<!-- Tech domain abbrevations list
+Location		lo
+OS Base Services	hb
+Multimedia		mm
+Multimedia Apps	ma
+Productivity	pr
+Personal Communications	vc
+Security		se
+User Interface		ui
+Data Communications	dc
+Device Connectivity	de
+Device Management	dm
+Runtimes and Web		rt
+Tools			to
+Operator Complementary Packages		ocp
 -->
 <SystemDefinition name="Foundation" schema="2.0.1">
 	<systemModel>
@@ -382,8 +382,8 @@
      </component>
     </collection>
     <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <!-- <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional">
-            <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+     <!-- <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional">
+            <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
           </component> -->
      <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
@@ -529,9 +529,12 @@
      <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC" plugin="N" origin-model="Symbian">
       <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
      </component>
+<!--  Bug 146 -  commdb export collision causes emulator instability -->
+<!--     
      <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC" plugin="N" origin-model="Symbian">
       <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
      </component>
+-->     
      <component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
      </component>

--- a/clean/sysdefs/system_model_os.xml	Thu Jun 25 14:45:21 2009 +0100
+++ b/clean/sysdefs/system_model_os.xml	Thu Jul 02 12:40:37 2009 +0100
@@ -1834,9 +1834,12 @@
         <component name="Prepare Default Comms Database" filter="gt" class="config PC">
           <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group\comms-infras_defaultcommdb.mrp"/>
         </component>
+<!--  Bug 146 -  commdb export collision causes emulator instability -->
+<!--
         <component name="Install Default Comms Database" class="PC">
           <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group\comms-infras_installdefaultcommdb.mrp" priority="1010"/>
         </component>
+-->        
         <component name="Comms Tools" introduced="9.4" class="PC">
           <unit mrp="os\commsfw\commsfwtools\commstools\group\comms-infras_tools.mrp"/>
         </component>