--- a/symbian3/single/sysdefs/system_model.xml	Mon Jan 18 15:54:33 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Mon Jan 18 16:21:50 2010 +0000
@@ -3113,18 +3113,17 @@
 </block>
 
 <block name="textandloc" long-name="Text and Localisation Services" level="services" levels="encoding util fonts tools text">
-<!-- dario: commented out to avoid collisions with S60
-collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
+<collection name="charconvfw" long-name="Character Conversion" level="encoding">
+<!-- component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
 <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-</component>
+</component -->
 <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/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">
 <unit bldFile="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/sf/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
 </component>
-</collection -->
+</collection>
 <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
 <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>