# HG changeset patch
# User andrew.jordan <>
# Date 1278275080 -3600
# Node ID 9e90376dbd1ed8ee6e87e975435d357598492da4
# Parent  05f4463787cf99a33775c2f1ac461d1aace01a6c# Parent  0f0bbe5dfe4bbdfcea4adad88e83d26119e93706
Merge Merge latest defect fixes with NVM changes

diff -r 0f0bbe5dfe4b -r 9e90376dbd1e baseport/syborg/rom/kernel.iby
--- a/baseport/syborg/rom/kernel.iby	Thu Jul 01 14:51:21 2010 +0100
+++ b/baseport/syborg/rom/kernel.iby	Sun Jul 04 21:24:40 2010 +0100
@@ -34,7 +34,7 @@
 extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\KDEBUG.DLL				\sys\bin\KDEBUG.DLL
 
 extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_LCD.DLL		\sys\bin\LCD.DLL
-device[VARID]=		\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_ESERIAL.PDD    	\sys\bin\ESERIAL.PDD
+device[VARID]=		\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_ESERIAL.PDD    	\sys\bin\EUART1.PDD
 extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\ELOCD.LDD				\sys\bin\ELOCD.LDD
 
 extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_EPOINTER.DLL		\sys\bin\EPOINTER.DLL