# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1250695113 -3600
# Node ID 11a2069166ef63c5f7fcefb7b2469448ab868443
# Parent  d3f1ef6d2469d4f29cc22478cd490309b138ce54# Parent  18257327af146cc3eeee3429a6f06addcdc4293d
catchup merge

diff -r 18257327af14 -r 11a2069166ef foundation/sysdefs/system_model.xml
--- a/foundation/sysdefs/system_model.xml	Fri Aug 14 15:48:57 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Wed Aug 19 16:18:33 2009 +0100
@@ -9545,14 +9545,18 @@
      <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" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N" origin-model="foundation">
       <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>