diff -r aeb961de6cf3 -r 886aa30ddbf9 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 14:20:17 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 14:24:44 2010 +0100
@@ -8287,113 +8287,6 @@
 </component>
 </collection>
 </block>
-<block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
-<collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
-<component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="sf_build" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-</component>
-<component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="sf_build" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-</component>
-<component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="sf_build" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-</component>
-<component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="sf_build" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-</component>
-<component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="sf_build" class="api">
-<unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-</component>
-</collection>
-<collection name="imageeditor" long-name="Image Editor UI" level="ui">
-<component name="pb" filter="sf_build" long-name="Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-</component>
-<component name="iepb" filter="sf_build" long-name="Image Editor Plugin Base">
-<unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-</component>
-<component name="imageeditorui" filter="sf_build" long-name="Image Editor UI">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-</component>
-<component name="imageeditormanager" filter="sf_build" long-name="Image Editor Manager">
-<unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-</component>
-<component name="imageeditorapp" filter="sf_build" long-name="Image Editor Application">
-<unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-</component>
-<component name="imageeditor_plugins" filter="sf_build" long-name="Image Editor Plugins" plugin="Y">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
-         -->
-</component>
-<component name="editorprovider" filter="sf_build" long-name="Image Editor Provider">
-<unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-</component>
-<component name="imageeditor_build" filter="sf_build" long-name="Image Editor Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditor/group"/>
-</component>
-</collection>
-<collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-<component name="filters" filter="sf_build" long-name="Image Editor Filters">
-<!-- can only have one unit. Need to include all from a single bld.inf -->
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-         -->
-</component>
-<component name="imageeditorutils" filter="sf_build" long-name="Image Editor Utilities">
-<unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-</component>
-<component name="systemparameters" filter="sf_build" long-name="System Parameters">
-<unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-</component>
-<component name="enginewrapper" filter="sf_build" long-name="Image Editor Engine Wrapper">
-<unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-</component>
-<component name="imageeditorengine_build" filter="sf_build" long-name="Image Editor Engine Build">
-<!-- should distribute this to the other components -->
-<unit bldFile="app/imgeditor/imageeditorengine/group"/>
-</component>
-</collection>
-</block>
 <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
 <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
 <component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">