# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1249656793 -3600
# Node ID 9dfd5bbd41f3c71e7263e89a0852fbff05bcc47a
# Parent  872d482fc7337af96abcf9570b8ebfb81f887edf# Parent  d12cee3f62aab03a180903a31eb95c136815db81
catchup merge

diff -r d12cee3f62aa -r 9dfd5bbd41f3 foundation/sysdefs/system_model.xml
--- a/foundation/sysdefs/system_model.xml	Thu Aug 06 11:06:00 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Fri Aug 07 15:53:13 2009 +0100
@@ -1766,14 +1766,19 @@
      <component name="charconvplugin" long-name="Charconv Plugin" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/charconvplugin/group"/>
      </component>
+<!-- MattD use S60 charconv tools...
      <component name="charconv_fw" origin-model="foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
       <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
      </component>
+-->     
      <!--Component manually removed and merged to OS-->
+     
      <!--<component name="charconvplugins"/>-->
+<!-- MattD: use S60 ibys and hopefully fix some s60 charconv build failures
     <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
      </component>
+-->     
      <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
      </component>