--- a/syborg_stem/syborg_stem_rom.oby	Mon Oct 11 22:35:41 2010 +0100
+++ b/syborg_stem/syborg_stem_rom.oby	Wed Oct 13 12:07:40 2010 +0100
@@ -1924,11 +1924,11 @@
 data=\epoc32\data\Z\Private\101F413C\backup_registration.xml 	"private\101F413C\backup_registration.xml"
 REM SQLITE3
 file=\epoc32\release\ARMV5\urel\sqlite3.dll 	"sys\bin\sqlite3.dll" 
-file=\epoc32\release\ARMV5\urel\ssmcmn.dll 	"sys\bin\ssmcmn.dll"
-file=\epoc32\release\ARMV5\urel\ssmcmd.dll 	"sys\bin\ssmcmd.dll"
-file=\epoc32\release\ARMV5\urel\sysstatemgr.exe 	"sys\bin\sysstatemgr.exe"
-file=\epoc32\release\ARMV5\urel\ssmstartsafe.dll 	"sys\bin\ssmstartsafe.dll"
-file=\epoc32\release\ARMV5\urel\domainpolicy2.dll 	"sys\bin\domainpolicy2.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmcmn.dll 	"sys\bin\ssmcmn.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmcmd.dll 	"sys\bin\ssmcmd.dll"
+file=\epoc32\release\ARMV5\UDEB\sysstatemgr.exe 	"sys\bin\sysstatemgr.exe"
+file=\epoc32\release\ARMV5\UDEB\ssmstartsafe.dll 	"sys\bin\ssmstartsafe.dll"
+file=\epoc32\release\ARMV5\UDEB\domainpolicy2.dll 	"sys\bin\domainpolicy2.dll"
 file=\epoc32\release\ARMV5\urel\subtitlegraphic.dll 	"sys\bin\subtitlegraphic.dll"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, subtitlegraphicdrawer.dll , subtitlegraphicdrawer.dll ) 
 REM surface update client\server
@@ -5842,52 +5842,52 @@
 file=\epoc32\release\ARMV5\urel\libssl.dll 	"sys\bin\libssl.dll"
 data=\epoc32\data\Z\System\INSTALL\openc_ssl_stub.sis 	"System\Install\openc_ssl_stub.sis"
 data=\epoc32\data\Z\System\INSTALL\openc_libzcore_stub.sis 	"System\Install\openc_libzcore_stub.sis"
-data=\epoc32\data\Z\private\2000D75B\startup\0\preuiservicescmdlist.rsc 	"private\2000D75B\startup\0\preuiservicescmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\uiservicescmdlist.rsc 	"private\2000D75B\startup\0\uiservicescmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\criticalappscmdlist.rsc 	"private\2000D75B\startup\0\criticalappscmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\selftestokcmdlist.rsc 	"private\2000D75B\startup\0\selftestokcmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\alarm_charging.rsc 	"private\2000D75B\startup\0\alarm_charging.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\securitycheckcmdlist.rsc 	"private\2000D75B\startup\0\securitycheckcmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\noncriticalcmdlist.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc 	"private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0_ext\uiservicescmdlist_ext.rsc 	"private\2000D75B\startup\0\uiservicescmdlist_ext.rsc"
-data=\epoc32\data\Z\private\2000D75B\startup\0_ext\noncriticalcmdlist_ext.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_ext.rsc"
-data=\epoc32\data\Z\private\2000D75B\hw\wserv_hw.rsc 	"private\2000D75B\startup\0\wserv.rsc"
-data=\epoc32\data\Z\private\2000D75B\hw\noncriticalcmdlist_hw.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc"
-data=\epoc32\data\Z\private\2000D75B\hw\usbwatcher_hw.rsc 	"private\2000D75B\startup\0\usbwatcher.rsc"
-data=\epoc32\data\Z\private\2000D75B\fail\failcmdlist.rsc 	"private\2000D75B\fail\failcmdlist.rsc"
-data=\epoc32\data\Z\private\2000D75B\shutdown\shutdowncmdlists.rsc 	"private\2000D75B\shutdown\shutdowncmdlists.rsc"
-data=\epoc32\data\Z\private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc 	"private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc"
-data=\epoc32\data\Z\private\2000D75B\swpui\uiswpcmdlists.rsc 	"private\2000D75B\swpui\uiswpcmdlists.rsc"
-data=\epoc32\data\Z\private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc 	"private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\stem_preuiservicescmdlist.rsc 	"private\2000D75B\startup\0\preuiservicescmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\stem_uiservicescmdlist.rsc 	"private\2000D75B\startup\0\uiservicescmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\stem_criticalappscmdlist.rsc 	"private\2000D75B\startup\0\criticalappscmdlist.rsc"
+//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_selftestokcmdlist.rsc 	"private\2000D75B\startup\0\selftestokcmdlist.rsc"
+//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_alarm_charging.rsc 	"private\2000D75B\startup\0\alarm_charging.rsc"
+//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_securitycheckcmdlist.rsc 	"private\2000D75B\startup\0\securitycheckcmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\startup\0\stem_noncriticalcmdlist.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist.rsc"
+//data=\epoc32\data\Z\private\2000D75B\startup\0\stem_emergencycallsonlycmdlist.rsc 	"private\2000D75B\startup\0\emergencycallsonlycmdlist.rsc"
+//data=\epoc32\data\Z\private\2000D75B\startup\0_ext\stem_uiservicescmdlist_ext.rsc 	"private\2000D75B\startup\0\uiservicescmdlist_ext.rsc"
+//data=\epoc32\data\Z\private\2000D75B\startup\0_ext\stem_noncriticalcmdlist_ext.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_ext.rsc"
+data=\epoc32\data\Z\private\2000D75B\hw\stem_wserv_hw.rsc 	"private\2000D75B\startup\0\wserv.rsc"
+//data=\epoc32\data\Z\private\2000D75B\hw\stem_noncriticalcmdlist_hw.rsc 	"private\2000D75B\startup\0\noncriticalcmdlist_hw.rsc"
+data=\epoc32\data\Z\private\2000D75B\hw\stem_usbwatcher_hw.rsc 	"private\2000D75B\startup\0\usbwatcher.rsc"
+data=\epoc32\data\Z\private\2000D75B\fail\stem_failcmdlist.rsc 	"private\2000D75B\fail\failcmdlist.rsc"
+data=\epoc32\data\Z\private\2000D75B\shutdown\stem_shutdowncmdlists.rsc 	"private\2000D75B\shutdown\shutdowncmdlists.rsc"
+//data=\epoc32\data\Z\private\2000D75B\rfstatusswpcmdlist\stem_rfswpcmdlists.rsc 	"private\2000D75B\rfstatusswpcmdlist\rfswpcmdlists.rsc"
+//data=\epoc32\data\Z\private\2000D75B\swpui\stem_uiswpcmdlists.rsc 	"private\2000D75B\swpui\uiswpcmdlists.rsc"
+//data=\epoc32\data\Z\private\2000D75B\swpnoncritical\stem_noncriticalswpcmdlists.rsc 	"private\2000D75B\swpnoncritical\noncriticalswpcmdlists.rsc"
 file=\epoc32\release\ARMV5\urel\saaemergencycallrfadaptation.dll 	"sys\bin\emergencycallrfadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saastateadaptation.dll 	"sys\bin\stateadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saasimadaptation.dll 	"sys\bin\simadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saamiscadaptation.dll 	"sys\bin\miscadaptation.dll"
 file=\epoc32\release\ARMV5\urel\saartcadaptation.dll 	"sys\bin\rtcadaptation.dll"
-file=\epoc32\release\ARMV5\urel\starterclient.dll 	"sys\bin\starterclient.dll"
-file=\epoc32\release\ARMV5\urel\startupadaptationadapter.dll 	"sys\bin\startupadaptationadapter.dll"
-file=\epoc32\release\ARMV5\urel\ssmclayersup.dll 	"sys\bin\ssmclayersup.dll"
-file=\epoc32\release\ARMV5\urel\rfstatusswppolicy.dll 	"sys\bin\rfstatusswppolicy.dll"
-file=\epoc32\release\ARMV5\urel\ssm.state.policy.0001.dll 	"sys\bin\ssm.state.policy.0001.dll"
+file=\epoc32\release\ARMV5\UDEB\starterclient.dll 	"sys\bin\starterclient.dll"
+file=\epoc32\release\ARMV5\UDEB\startupadaptationadapter.dll 	"sys\bin\startupadaptationadapter.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmclayersup.dll 	"sys\bin\ssmclayersup.dll"
+file=\epoc32\release\ARMV5\UDEB\rfstatusswppolicy.dll 	"sys\bin\rfstatusswppolicy.dll"
+file=\epoc32\release\ARMV5\UDEB\ssm.state.policy.0001.dll 	"sys\bin\ssm.state.policy.0001.dll"
 data=\epoc32\data\Z\private\2000d75b\normal\gsanormalcmdlist.rsc 	"private\2000d75b\normal\gsanormalcmdlist.rsc"
-file=\epoc32\release\ARMV5\urel\customcmds.dll 	"sys\bin\customcmds.dll"
-file=\epoc32\release\ARMV5\urel\ssm.swp.policy.simstatus.dll 	"sys\bin\ssm.swp.policy.simstatus.dll"
+file=\epoc32\release\ARMV5\UDEB\customcmds.dll 	"sys\bin\customcmds.dll"
+file=\epoc32\release\ARMV5\UDEB\ssm.swp.policy.simstatus.dll 	"sys\bin\ssm.swp.policy.simstatus.dll"
 data=\epoc32\data\Z\private\10202be9\2001d2aa.txt 	"private\10202be9\2001d2aa.txt"
-file=\epoc32\release\ARMV5\urel\ssmactivitycmd.dll 	"sys\bin\ssmactivitycmd.dll"
-file=\epoc32\release\ARMV5\urel\ssmsystemcmds.dll 	"sys\bin\ssmsystemcmds.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmactivitycmd.dll 	"sys\bin\ssmactivitycmd.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmsystemcmds.dll 	"sys\bin\ssmsystemcmds.dll"
 file=\epoc32\release\ARMV5\urel\ssmdiskreserver.exe 	"sys\bin\ssmdiskreserver.exe"
 file=\epoc32\release\ARMV5\urel\ssmmapperutility.dll 	"sys\bin\ssmmapperutility.dll"
-file=\epoc32\release\ARMV5\urel\ssmpolicybase.dll 	"sys\bin\ssmpolicybase.dll"
-file=\epoc32\release\ARMV5\urel\ssmstatepolicybase.dll 	"sys\bin\ssmstatepolicybase.dll"
-file=\epoc32\release\ARMV5\urel\ssmswppolicybase.dll 	"sys\bin\ssmswppolicybase.dll"
-file=\epoc32\release\ARMV5\urel\ssm.state.policy.0000.dll 	"sys\bin\ssm.state.policy.0000.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmpolicybase.dll 	"sys\bin\ssmpolicybase.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmstatepolicybase.dll 	"sys\bin\ssmstatepolicybase.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmswppolicybase.dll 	"sys\bin\ssmswppolicybase.dll"
+file=\epoc32\release\ARMV5\UDEB\stem_ssm.state.policy.0000.dll 	"sys\bin\ssm.state.policy.0000.dll"
 file=\epoc32\release\ARMV5\urel\ssm.state.policy.0002.dll 	"sys\bin\ssm.state.policy.0002.dll"
 file=\epoc32\release\ARMV5\urel\ssm.state.policy.0003.dll 	"sys\bin\ssm.state.policy.0003.dll"
-file=\epoc32\release\ARMV5\urel\ssmuiswppolicy.dll 	"sys\bin\ssmuiswppolicy.dll"
-file=\epoc32\release\ARMV5\urel\ssmnoncriticalswppolicy.dll 	"sys\bin\ssmnoncriticalswppolicy.dll"
-file=\epoc32\release\ARMV5\urel\ssmpowersup.dll 	"sys\bin\ssmpowersup.dll"
-file=\epoc32\release\ARMV5\urel\ssmlocaleobserversup.dll 	"sys\bin\ssmlocaleobserversup.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmuiswppolicy.dll 	"sys\bin\ssmuiswppolicy.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmnoncriticalswppolicy.dll 	"sys\bin\ssmnoncriticalswppolicy.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmpowersup.dll 	"sys\bin\ssmpowersup.dll"
+file=\epoc32\release\ARMV5\UDEB\ssmlocaleobserversup.dll 	"sys\bin\ssmlocaleobserversup.dll"
 data=\epoc32\data\Z\private\2000d766\backup_registration.xml 	"private\2000d766\backup_registration.xml"
 __ECOM_PLUGIN(\epoc32\release\ARMV5\urel,Sys\Bin,\epoc32\data\Z,Resource\Plugins, ssyreferenceplugin.dll , ssyreferenceplugin.dll ) 
 data=\epoc32\data\Z\Private\1020507E\reference\SsyReferenceConfig.xml 	"private\1020507E\reference\SsyReferenceConfig.xml"