--- a/symbian4/adaptation/beagleboard/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/adaptation/beagleboard/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
 <unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
@@ -66,6 +66,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/adaptation/qemu/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/adaptation/qemu/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,15 +51,15 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
 <unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/adaptation/stubs/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
 <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
 <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
@@ -155,6 +155,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/browserui/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,15 +51,15 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
 <collection name="browserui_info" long-name="Browser UI Info" level="ui">
 <component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
 <unit bldFile="/sf/app/browserui" proFile="browserui.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/camera/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/camera/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,15 +51,15 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="camera" level="apps" long-name="Camera Apps">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="camera" level="apps" long-name="Camera Apps">
 <collection name="camerauis" long-name="Camera UIs">
 <component name="cameraxui" filter="s60" long-name="CameraX UIs">
 <unit bldFile="/sf/app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/commonemail/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
 <!-- need to resolve the qt parts into proper components, then uncomment the units -->
 <collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
 <component name="nmail_client_api" long-name="NMail Client API" filter="s60" introduced="^4" class="api placeholder">
@@ -132,6 +132,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/conntools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/conntools/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
 <collection name="nettools" long-name="Net Tools" level="app">
 <component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
 <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
@@ -66,6 +66,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/contacts/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
 <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
 <component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
 </collection>
@@ -121,6 +121,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/contentcontrol/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin framework app">
 <collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
 <component name="ds_contactsdatastoreextension_api" long-name="DS Contacts Data Store Extension API" filter="s60" introduced="^4" class="api">
 <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_contactsdatastoreextension_api/group"/>
@@ -86,6 +86,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/devicecontrol/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
 <collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
 <component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
 <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/adapters/bld"/>
@@ -75,6 +75,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/files/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/files/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
 <collection name="filemanager" long-name="File Manager" level="apps">
 <component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
 <component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
@@ -65,6 +65,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/firsttimeuse/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="firsttimeuse" level="apps" long-name="First Time Use" levels="support services ui app">
 <!-- these empty collections are really components. Move down a directory and supply units -->
 <collection name="ftuapplication" long-name="First Time Use Application" level="app"/>
 <collection name="fturuntimeservices" long-name="First Time Use Runtime Services" level="services"/>
@@ -66,6 +66,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/helps/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/helps/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
 <collection name="userguide" long-name="User Guide" level="if">
 <!-- collection is really a component. Move down a directory -->
 <component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
@@ -71,6 +71,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/homescreen/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
 <collection name="homescreen_info" long-name="Home Screen Info" level="support">
 <component name="homescreen_build" long-name="Homescreen Build">
 <!-- break this up properly into components -->
@@ -88,6 +88,6 @@
 <component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/imgeditor/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/imgeditor/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <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="/sf/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
@@ -160,6 +160,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/internetradio/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/internetradio/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
 <collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
 <!-- collection is really a component. Move down a dir -->
 <component name="internetradio2_0_build" long-name="Internet Radio 2.0 Build">
@@ -73,6 +73,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/jrt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
 <collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
 <component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
 <unit bldFile="/sf/app/jrt/jrt_plat/java_registry_api/build"/>
@@ -108,6 +108,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/location/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/location/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
 <collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
 <component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
 <unit bldFile="/sf/app/location/location_plat" proFile="location_plat.pro"/>
@@ -72,6 +72,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/messaging/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="plugin eng base app api">
 <collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="api">
 <component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api"/>
 <component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api"/>
@@ -185,6 +185,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/musicplayer/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
 <!-- move the export .pri files into their components and uncomment the units -->
 <collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
 <component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
@@ -111,6 +111,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/organizer/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
 <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
 <component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
 <!-- move into own .pro file -->
@@ -206,6 +206,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/phone/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
 <collection name="phoneapp" long-name="Phone Application" level="app">
 <component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneapp/blacklist/group"/>
@@ -200,6 +200,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/photos/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="photos" level="apps" long-name="Photos" levels="util support ui app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="photos" level="apps" long-name="Photos" levels="util support ui app">
 <collection name="photos_group" long-name="Photos Group" level="support">
 <component name="photos_group_build" filter="s60" long-name="Photos Group Build" introduced="^4" class="placeholder">
 <!--<unit bldFile="group" qt:proFile="group.pro"/> -->
@@ -103,6 +103,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/podcatcher/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/podcatcher/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
 <collection name="podcatcher_info" long-name="Podcatcher" level="app">
 <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
 <!-- has exports from top level bld.inf -->
@@ -67,6 +67,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/printing/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/printing/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="printing" level="services" long-name="Printing"/>
-</layer>
-</systemModel>
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="printing" level="services" long-name="Printing"/>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/radio/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
 <collection name="radioengine" long-name="Radio Engine" level="engine">
 <component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
 <unit bldFile="/sf/app/radio/radioengine/utils/group"/>
@@ -86,6 +86,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/recents/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/recents/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
 <collection name="recents_plat" long-name="Recent Events Platform Interfaces" level="api">
 <component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
 <component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
@@ -67,6 +67,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/rndtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="rndtools" level="services" long-name="R&amp;D tools" levels="support generic test util">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="rndtools" level="services" long-name="R&amp;D tools" levels="support generic test util">
 <collection name="creator" long-name="Creator" level="support">
 <!-- collection is really a component. Should move down a directory -->
 <component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
@@ -144,6 +144,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/search/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/search/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="search" level="apps" long-name="Search Apps" levels="eng base app api">
 <collection name="search_info" long-name="Search Info">
 <component name="search_build" long-name="Search Build" introduced="^4">
 <unit bldFile="/sf/app/search/group"/>
@@ -65,6 +65,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/settingsuis/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/settingsuis/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
 <collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
 <component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
 <unit bldFile="/sf/app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
@@ -66,6 +66,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/techview/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/techview/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
 <collection name="buildverification" long-name="Build Verification" level="services">
 <component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
 <unit bldFile="/sf/app/techview/buildverification/autosmoketest/Group" mrp="/sf/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
@@ -83,6 +83,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/videoeditor/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/videoeditor/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
 <collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
 <component name="video_editor_engine_api" filter="sf_build" long-name="Video Editor Engine API" introduced="^2" class="api">
 <unit bldFile="/sf/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
@@ -112,6 +112,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/videoplayer/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <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">
 <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
@@ -102,6 +102,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/accesssec/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
 <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
 <component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
 <unit bldFile="/sf/mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
@@ -122,6 +122,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/appinstall/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
 <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
 <component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
@@ -172,6 +172,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/appsupport/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
 <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
 <component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
 <unit bldFile="/sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
@@ -344,6 +344,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/browser/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,15 +51,15 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
 <collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
 <component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
 <unit bldFile="/sf/mw/browser/bookmarksengine" proFile="bookmarksengine.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/btservices/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
 <collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
 <component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
 <unit bldFile="/sf/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
@@ -168,6 +168,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/camerasrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
 <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
 <component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
 <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
@@ -89,6 +89,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/classicui/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
 <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
 <component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
@@ -625,6 +625,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/dlnasrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/dlnasrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
 <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
 <collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
 <component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
@@ -245,6 +245,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/drm/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
 <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
 <component name="roap_api" long-name="ROAP API" filter="s60" class="api">
 <unit bldFile="/sf/mw/drm/drm_plat/roap_api/group"/>
@@ -154,6 +154,6 @@
 </collection>
 <collection name="drm_info" long-name="DRM Info" level="specific"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/gsprofilesrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
 <collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
 <component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
@@ -112,6 +112,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/gstreamer/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/gstreamer/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="gstreamer" level="generic" long-name="GStreamer" levels="plugin core api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="gstreamer" level="generic" long-name="GStreamer" levels="plugin core api">
 <!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
 <!-- structure matches planned directory layout -->
 <collection name="gstreamerfw" long-name="GStreamer Framework" level="core">
@@ -91,6 +91,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/hapticsservices/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/hapticsservices/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
 <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
 <component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
 <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
@@ -99,6 +99,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/hb/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/hb/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="hb" level="generic" long-name="Orbit" levels="engine test api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="hb" level="generic" long-name="Orbit" levels="engine test api">
 <collection name="hb_info" long-name="Orbit Info" level="api">
 <component name="hb_build" long-name="Orbit Build" introduced="^4">
 <!-- should break this down into actual components -->
@@ -66,6 +66,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/helix/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/helix/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
 <collection name="helix_ren" long-name="Helix Engine" level="framework">
 <!-- what does "ren" stand for? -->
 <component name="helix_stub" filter="s60" long-name="Helix Stub" introduced="^2" class="api">
@@ -61,6 +61,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/hgwidgets/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
 <collection name="hgwidgets_plat" long-name="HG Widgets Platform Interfaces" level="api">
 <component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
 <!-- should separate out unit -->
@@ -72,6 +72,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/homescreensrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
 <collection name="appfoundation" long-name="App Foundation" level="generic">
 <component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
 <unit bldFile="/sf/mw/homescreensrv/appfoundation" qmakeArgs="-r" proFile="appfoundation.pro"/>
@@ -140,6 +140,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/homescreensrvlegacy/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/homescreensrvlegacy/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
 <collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
 <component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
 <unit bldFile="/sf/mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
@@ -63,6 +63,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/imghandling/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
 <collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
 <component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
 <unit bldFile="/sf/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
@@ -80,6 +80,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/imsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/imsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
 <collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
 <component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
 <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
@@ -164,6 +164,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/inputmethods/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
 <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
 <component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
 <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
@@ -133,6 +133,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/ipappprotocols/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
 <collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
 <component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
@@ -107,6 +107,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/ipappsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/ipappsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
 <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
 <component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
@@ -116,6 +116,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server utils api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server utils api">
 <collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="api">
 <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
@@ -208,6 +208,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/legacypresence/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
 <collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
 <component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
 <unit bldFile="/sf/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
@@ -143,6 +143,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/locationsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
 <collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
 <component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
 <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
@@ -230,6 +230,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/mds/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
 <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
 <component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
@@ -169,6 +169,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/messagingmw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/messagingmw/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack support fw api">
 <collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
 <component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
 <unit bldFile="/sf/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
@@ -137,6 +137,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/metadatasrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/metadatasrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
 <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
 <component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
 <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
@@ -70,6 +70,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/mmappfw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
 <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
 <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
 <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
@@ -187,6 +187,6 @@
 <component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/mmmw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
 <collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
 <component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
 <unit bldFile="/sf/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
@@ -196,6 +196,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/netprotocols/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/netprotocols/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
 <collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
 <component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
 <unit bldFile="/sf/mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
@@ -137,6 +137,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/opensrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/opensrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
 <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
 <component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
@@ -90,6 +90,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/phonesrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
 <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
 <component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
 <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
@@ -193,6 +193,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/platformthemes/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/platformthemes/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="platformthemes" level="specific" long-name="Platform Themes" levels="framework generic ui">
 <collection name="platformthemes_info" long-name="Platform Themes Info">
 <component name="platformthemes_build" long-name="Platform Themes Build">
 <!-- no real structure in this package. Should break into collections / components -->
@@ -61,6 +61,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/platformtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/platformtools/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="platformtools" level="generic" long-name="Platform Tools">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="platformtools" level="generic" long-name="Platform Tools">
 <collection name="gfxconversion" long-name="Graphics Conversion">
 <component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
 <unit bldFile="/sf/mw/platformtools/gfxconversion/bmconv_s60/group"/>
@@ -63,6 +63,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/qt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="qt" level="generic" long-name="Qt" levels="tool mw app">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
 <collection name="qtconf" long-name="Qt Config" level="tool">
 <component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="qt_tools" introduced="^2" class="config tool">
 <unit bldFile="/sf/mw/qt/src/s60installs/deviceconfiguration"/>
@@ -76,6 +76,6 @@
 </collection>
 <collection name="qt_tests" long-name="Qt Tests" level="app"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/qtextensions/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
 <collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
 <component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
 <unit bldFile="/sf/mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
@@ -101,6 +101,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/remoteconn/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/remoteconn/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
 <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
 <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="/sf/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
@@ -103,6 +103,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/remotemgmt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
 <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
 <component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
@@ -274,6 +274,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/searchsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
 <collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
 <component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" introduced="^4" class="api">
 <unit bldFile="/sf/mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
@@ -114,6 +114,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/securitysrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
 <collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
 <component name="cms_api" long-name="CMS API" filter="s60" class="api">
 <unit bldFile="/sf/mw/securitysrv/secsrv_plat/cms_api/group"/>
@@ -232,6 +232,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/serviceapi/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/serviceapi/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
 <!-- should break up this collection into something meaningful -->
 <collection name="serviceproviders" long-name="Service Providers" level="mw1">
 <component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
@@ -98,6 +98,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/serviceapifw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/serviceapifw/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
 <collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
 <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
 <component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
@@ -105,6 +105,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/shortlinkconn/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/shortlinkconn/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
 <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
 <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
 <component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
@@ -108,6 +108,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/srvdiscovery/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
 <collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
 <component name="upnp_device_api" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
 <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
@@ -90,6 +90,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/svgt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/svgt/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
 <collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
 <component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
 <unit bldFile="/sf/mw/svgt/svgt_plat/svgt_api/group"/>
@@ -72,6 +72,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/uiaccelerator/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/uiaccelerator/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
 <collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
 <component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
@@ -85,6 +85,6 @@
 </collection>
 <collection name="uiaccelerator_test" long-name="UI Accelerator Test" level="ex"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/uiresources/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/uiresources/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
 <!-- are the custom filters below needed? -->
 <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
 <component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
@@ -198,6 +198,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/uitools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/uitools/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
 <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
 <component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
@@ -108,6 +108,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/usbservices/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
 <collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
 <component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
 <unit bldFile="/sf/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
@@ -149,6 +149,6 @@
 </collection>
 <collection name="usbservices_test" long-name="USB Services Test" level="server"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/videoutils/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/videoutils/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
 <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="if">
 <component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
 <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
@@ -68,6 +68,6 @@
 <component name="schedulerserver" filter="s60" long-name="Video Scheduler Server"/>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/vpnclient/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
 <!-- is the !oem_build filter needed? -->
 <collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
 <component name="vpnapi" filter="s60" long-name="VPN API" class="api">
@@ -178,6 +178,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/web/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
 <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
 <component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
 <unit bldFile="/sf/mw/web/web_pub/browser_control_api/group"/>
@@ -284,6 +284,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/webruntime/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/webruntime/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="webruntime" level="specific" long-name="Web Runtime">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="webruntime" level="specific" long-name="Web Runtime">
 <!-- need to break up this package nito collections and components -->
 <collection name="webruntime_info" long-name="Web Runtime Info">
 <component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
@@ -61,6 +61,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/websrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/websrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
 <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
 <component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
 <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/group"/>
@@ -172,6 +172,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/wirelessacc/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
 <collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
 <component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
 <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
@@ -118,6 +118,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/boardsupport/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/boardsupport/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
 <collection name="emulator" long-name="Emulator" level="bsp">
 <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
 <unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
@@ -70,6 +70,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/bt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/bt/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
 <component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
 <unit bldFile="/sf/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
@@ -136,6 +136,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/buildtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/buildtools/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
 <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
 <component name="sysdeftools" long-name="System Definition Tools" purpose="development" introduced="^2">
 <unit mrp="/sf/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
@@ -94,6 +94,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/cellularsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
@@ -161,6 +161,6 @@
 </collection>
 <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/commsfw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/commsfw/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
 <collection name="commsprocess" long-name="Comms Process" level="process">
 <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory">
 <unit bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
@@ -133,6 +133,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
 <collection name="s60extras" long-name="S60 Extras" level="mid">
 <!-- collection is really a component. Need to move down a directory -->
 <component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
@@ -110,6 +110,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/devicesrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
 <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
@@ -423,6 +423,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/graphics/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
 <collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
 <component name="vgi" filter="s60" long-name="VGI">
 <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
@@ -206,6 +206,6 @@
 </collection>
 <collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/imagingext/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/imagingext/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
 <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
 <component name="exif_api" long-name="Exif API" filter="s60" class="api">
 <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -100,6 +100,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/kernelhwsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit bldFile="/sf/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -192,6 +192,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/lbs/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -137,6 +137,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/mm/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
 <unit bldFile="/sf/os/mm/mm_pub/audio_effects_api/group"/>
@@ -470,6 +470,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/networkingsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/networkingsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -186,6 +186,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/osrndtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
 <collection name="stif" long-name="STIF" level="fw">
 <component name="stif_plat" filter="s60" long-name="STIF Platform Interfaces" purpose="development" class="api">
 <unit bldFile="/sf/os/osrndtools/stif/stif_plat/group"/>
@@ -169,6 +169,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/ossrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
 <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
 <component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
 <unit bldFile="/sf/os/ossrv/ossrv_pub/boost_apis/group"/>
@@ -460,6 +460,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/persistentdata/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/persistentdata/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="/sf/os/persistentdata/featuremgmt/featuremgr/group" mrp="/sf/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -104,6 +104,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/security/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/security/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
 <collection name="authenticationservices" long-name="Authentication Services" level="utilities">
 <component name="authenticationserver" long-name="Authentication Server" introduced="^4" purpose="optional">
 <unit bldFile="/sf/os/security/authenticationservices/authenticationserver/group" mrp="/sf/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
@@ -136,6 +136,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/textandloc/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/textandloc/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
 <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
 <component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
 <unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/group"/>
@@ -148,6 +148,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/usb/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/usb/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
 <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
@@ -71,6 +71,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/wlan/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/wlan/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
 <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
 <component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
 <unit bldFile="/sf/os/wlan/wlan_plat/wlan_dbif_api/group"/>
@@ -134,6 +134,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/xmlsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
+++ b/symbian4/os/xmlsrv/package_definition.xml	Fri Jun 11 15:15:56 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+ <systemModel>
+  <layer name="os" long-name="OS" levels="hw services">
+   <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
 <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
 <component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
 <!-- need to fix the configuration used here. 
@@ -114,6 +114,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file