# HG changeset patch
# User markw <markw@symbian.org>
# Date 1290079057 0
# Node ID a3d769bd1939e08504707523f96517d0a98a9fb7
# Parent  40dccd6dd558215a26c93d82c7fbadd6406b64df# Parent  bbbba97ac26086ce5dfddfc6a74cb173c00626dd
Merge to tip.

diff -r 40dccd6dd558 -r a3d769bd1939 generic_stem/beagle_stem.oby
--- a/generic_stem/beagle_stem.oby	Thu Nov 18 11:12:10 2010 +0000
+++ b/generic_stem/beagle_stem.oby	Thu Nov 18 11:17:37 2010 +0000
@@ -49,6 +49,7 @@
 extension[VARID]=\epoc32\release\ARMV5\urel\rm_debug.ldd 	"sys\bin\rm_debug.ldd"
 file=\epoc32\release\ARMV5\urel\rm_debug_svr.exe 	"sys\bin\rm_debug_svr.exe"
 file=\epoc32\release\ARMV5\DEBUG_DIR\_omap3530_euser.dll 	"sys\bin\EUser.dll"
+extension[VARID]=\epoc32\release\ARMV5\urel\evfp.dll 	"sys\bin\evfp.dll"
 file=\epoc32\release\ARMV5\urel\RPIPE.DLL 	"sys\bin\rpipe.dll"
 file=\epoc32\release\ARMV5\urel\ektran.dll 	"sys\bin\EKTran.dll"
 file=\epoc32\release\ARMV5\urel\_beagle_hal.dll 	"sys\bin\Hal.dll"
diff -r 40dccd6dd558 -r a3d769bd1939 generic_stem/stem_rom.oby
--- a/generic_stem/stem_rom.oby	Thu Nov 18 11:12:10 2010 +0000
+++ b/generic_stem/stem_rom.oby	Thu Nov 18 11:17:37 2010 +0000
@@ -2240,6 +2240,7 @@
 data=\epoc32\data\Z\Resource\eikcdlg.rsc 	"resource\eikcdlg.rsc"
 file=\epoc32\release\ARMV5\urel\stem_eiksrvui.dll 	"sys\bin\eiksrvui.dll"
 file=\epoc32\release\ARMV5\urel\eikalert.dll 	"sys\bin\eikalert.dll"
+file=\epoc32\release\ARMV5\urel\econseik.dll 	"sys\bin\econs.dll" uid3=0x100039e7
 data=\epoc32\data\Z\System\install\WMA_AudCon_stub.sis 	"System\Install\WMA_AudCon_stub.sis"
 data=\epoc32\data\Z\System\install\EnhancedMediaClient_Stub.SIS 	"System\Install\EnhancedMediaClient_Stub.SIS"
 data=\epoc32\data\Z\System\install\DosEnPolicy_stub.sis 	"system\install\DosEnPolicy_stub.sis"
diff -r 40dccd6dd558 -r a3d769bd1939 syborg_stem/rom_content.csv
--- a/syborg_stem/rom_content.csv	Thu Nov 18 11:12:10 2010 +0000
+++ b/syborg_stem/rom_content.csv	Thu Nov 18 11:17:37 2010 +0000
@@ -3444,7 +3444,7 @@
 sys\bin\EComPatchData.dll,/epoc32/release/armv5/urel/ecompatchdata.dll,ecom.iby,os/ossrv,,,
 sys\bin\ecompluginnotifier.dll,/epoc32/release/armv5/urel/ecompluginnotifier.dll,core/mw/aknglobalui.iby,mw/classicui,,,
 sys\bin\EComServer.exe,/epoc32/release/armv5/urel/ecomserver.exe,ecom.iby,os/ossrv,,,
-sys\bin\econs.dll,/epoc32/release/armv5/urel/econseik.dll,core/mw/eikstd.iby,mw/classicui,Out,Auto,Not referenced during boot
+sys\bin\econs.dll,/epoc32/release/armv5/urel/econseik.dll,core/mw/eikstd.iby,mw/classicui,In,WR,Needed for eshell & RTest code
 sys\bin\ecuart.csy,/epoc32/release/armv5/urel/ecuart.csy,ecuart.iby,os/commsfw,Out,Auto,Not referenced during boot
 sys\bin\EDbms.dll,/epoc32/release/armv5/urel/edbms.dll,dbms.iby,os/persistentdata,,,
 sys\bin\EDbsrv.exe,/epoc32/release/armv5/urel/edbsrv.exe,dbms.iby,os/persistentdata,,,