--- a/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/adaptation/qemu/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/adaptation/qemu/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,15 +51,15 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/adaptation/stubs/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/adaptation/stubs/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="stubs" level="high" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
 <unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
@@ -90,6 +90,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/camera/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/camera/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="camera_plat" long-name="Camera Apps Platform Interfaces">
 <component name="camcorder_ui_constants_api" long-name="Camcorder UI Constants API" filter="s60" class="api">
 <unit bldFile="/sf/app/camera/camera_plat/camcorder_ui_constants_api/group"/>
@@ -73,6 +73,6 @@
 </collection>
 <collection name="camera_info" long-name="Camera Apps Info"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/commonemail/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/commonemail/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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">
 <collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
 <component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
 <unit bldFile="/sf/app/commonemail/email_pub/email_widget_api/group"/>
@@ -201,6 +201,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/conntools/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/conntools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/app/contacts/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/contacts/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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_pub" long-name="Contacts Apps Public Interfaces" level="ui">
 <component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
 <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
@@ -311,6 +311,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/contentcontrol/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/contentcontrol/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
 <collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
 <component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
 <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
@@ -86,6 +86,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/conversations/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/conversations/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
 <collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
 <component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
 <unit bldFile="/sf/app/conversations/conversations_plat/im_cv_launcher_api/group"/>
@@ -152,6 +152,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/devicecontrol/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/devicecontrol/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="devicediagnostics" long-name="Device Diagnostics" level="app">
 <component name="devdiagapp" filter="s60" long-name="Device Diagnostics App">
 <unit bldFile="/sf/app/devicecontrol/devicediagnostics/devdiagapp/group"/>
@@ -150,6 +150,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/dictionary/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/dictionary/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
 <collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
 <component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
 <unit bldFile="/sf/app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
@@ -66,6 +66,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/files/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/files/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
 <component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
 <unit bldFile="/sf/app/files/files_plat/memory_scan_popup_ui_api/group"/>
@@ -95,6 +95,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/graphicsuis/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/graphicsuis/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
 <collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
 <component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
 <unit bldFile="/sf/app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
@@ -71,6 +71,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/helps/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/helps/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="csxhelp" long-name="Context Sensitive Extended Help" level="if">
 <!-- this is really a component. Should move it down a directory -->
 <component name="csxhelp_build" filter="s60" long-name="Context Sensitive Extended Help Build">
@@ -71,6 +71,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/homescreen/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/homescreen/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
 <collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
 <component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
 <unit bldFile="/sf/app/homescreen/homescreen_plat/menu_settings_api/group"/>
@@ -125,6 +125,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/homescreentools/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/homescreentools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
 <collection name="dtdinstaller" long-name="DTD Installer" level="install">
 <!-- collection is really a component. Needs to be moved down a directory -->
 <!-- this needs to be built first, does build order need to be forced with filters? -->
@@ -76,6 +76,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/im/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/im/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
 <collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
 <component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
 <unit bldFile="/sf/app/im/im_plat/wv_sap_settings_api/group"/>
@@ -66,6 +66,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/imgeditor/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/imgeditor/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="s60" 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/CompilerCompatibility/app/iptelephony/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/iptelephony/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
 <collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
 <component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
@@ -181,6 +181,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/jrt/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/jrt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -71,6 +71,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/location/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/location/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
 <collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps"/>
 <collection name="loc_pub" long-name="Location Apps Public Interfaces" level="apps">
 <component name="landmarks_ui_selector_api" long-name="Landmarks UI Selector API" filter="s60" class="api">
@@ -147,6 +147,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/messaging/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/messaging/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
 <collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
 <component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
 <unit bldFile="/sf/app/messaging/msg_pub/messaging_integration_api/group"/>
@@ -287,6 +287,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
 <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
 <component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
 <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
@@ -115,6 +115,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/musicplayer/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/musicplayer/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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">
 <collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
 <component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
 <unit bldFile="/sf/app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
@@ -145,6 +145,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/organizer/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/organizer/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
 <component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
 <unit bldFile="/sf/app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
@@ -322,6 +322,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/phone/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/phone/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
 <component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
@@ -199,6 +199,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/photos/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/photos/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
 <collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
 <component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/app/photos/photos_plat/collection_plugins_api/group"/>
@@ -119,6 +119,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/podcatcher/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/podcatcher/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,15 +51,15 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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">
 <unit bldFile="/sf/app/podcatcher/group"/>
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/printing/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/printing/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="printing" level="services" long-name="Printing" levels="app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="printing" level="services" long-name="Printing" levels="app">
 <collection name="DirectPrint" level="app">
 <component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
 <unit bldFile="/sf/app/printing/DirectPrint/DirectPrintApp/group"/>
@@ -81,6 +81,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/profile/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/profile/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="profile" level="apps" long-name="Profiles" levels="app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="profile" level="apps" long-name="Profiles" levels="app">
 <collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
 <component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
 <unit bldFile="/sf/app/profile/profile_plat/profiles_settings_view_api/group"/>
@@ -70,6 +70,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/radio/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/radio/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="fmradio" long-name="FM Radio" level="ui">
 <component name="activeidleengine" filter="s60" long-name="FM Radio Active Idle Engine">
 <unit bldFile="/sf/app/radio/fmradio/activeidleengine/group"/>
@@ -79,6 +79,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/rndtools/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/rndtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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">
@@ -137,6 +137,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/screensaver/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/screensaver/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
 <!-- is this a user-facing application or a daemon? -->
 <!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
 <collection name="scrsaver" long-name="Screen Saver" level="plugin">
@@ -76,6 +76,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/settingsuis/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/settingsuis/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
 <collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
 <component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
 <unit bldFile="/sf/app/settingsuis/devmngt_plat/default_app_client_api/group"/>
@@ -86,6 +86,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/speechsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/speechsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
 <collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
 <component name="vas_api" long-name="VAS API" filter="s60" class="api">
 <unit bldFile="/sf/app/speechsrv/speechsrv_plat/vas_api/group"/>
@@ -229,6 +229,6 @@
 </collection>
 <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/techview/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/techview/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/app/utils/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/utils/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="utils" level="apps" long-name="Utility Apps" levels="app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="utils" level="apps" long-name="Utility Apps" levels="app">
 <collection name="extras" long-name="Extras" level="app">
 <component name="about" filter="s60" long-name="About Application">
 <unit bldFile="/sf/app/utils/extras/about/group"/>
@@ -63,6 +63,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/videoplayer/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/videoplayer/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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" filter="!test"/>
@@ -183,6 +183,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/videotelephony/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/videotelephony/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
 <collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
 <component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
 <unit bldFile="/sf/app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
@@ -90,6 +90,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/voicerec/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/voicerec/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="voicerec" level="apps" long-name="Voice Recorder Apps">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
 <!-- custom filter pref_test-->
 <collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
 <component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
@@ -71,6 +71,6 @@
 </collection>
 <collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/app/webuis/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/app/webuis/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
+ <systemModel>
+  <layer name="app" long-name="Applications" levels="services apps">
+   <block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
 <collection name="browserui" long-name="Browser UI" level="app">
 <component name="browser" filter="s60" long-name="Browser">
 <unit bldFile="/sf/app/webuis/browserui/browser/group"/>
@@ -96,6 +96,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/accesssec/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/accesssec/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/appinstall/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/appinstall/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -157,6 +157,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/appsupport/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/appsupport/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -335,6 +335,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/btservices/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/btservices/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -157,6 +157,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/camerasrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/camerasrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -115,6 +115,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/classicui/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/classicui/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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" filter="!test"/>
@@ -634,6 +634,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/dlnasrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/dlnasrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/drm/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/drm/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -155,6 +155,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/CompilerCompatibility/mw/gsprofilesrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/gsprofilesrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -111,6 +111,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/hapticsservices/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/hapticsservices/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/helix/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/helix/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/homescreensrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/homescreensrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="homescreensrv_plat" long-name="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/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
@@ -229,6 +229,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/imghandling/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/imghandling/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -77,6 +77,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/imsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/imsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/inputmethods/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/inputmethods/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -175,6 +175,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/ipappprotocols/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/ipappprotocols/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/ipappsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/ipappsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
 <collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="utils">
 <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"/>
@@ -205,6 +205,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/legacypresence/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/legacypresence/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/locationsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/locationsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -231,6 +231,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/mds/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/mds/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/messagingmw/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/messagingmw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
 <collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
 <component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
 <unit bldFile="/sf/mw/messagingmw/msgfw_pub/send_ui_api/group"/>
@@ -133,6 +133,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
 <!-- Leave commented out until confguration is in use
@@ -90,6 +90,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/mmappfw/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/mmappfw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -190,6 +190,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/CompilerCompatibility/mw/mmmw/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/mmmw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -187,6 +187,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/mmuifw/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/mmuifw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
 <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="api">
 <component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" class="api">
 <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
@@ -165,6 +165,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/netprotocols/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/netprotocols/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/phonesrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/phonesrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -270,6 +270,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/platformtools/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/platformtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/qt/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/qt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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" introduced="^2" class="config tool">
 <unit bldFile="/sf/mw/qt/src/s60installs/deviceconfiguration"/>
@@ -83,6 +83,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/remoteconn/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/remoteconn/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="connectivitymodules" long-name="Connectivity Modules" level="framework">
 <component name="secon" filter="s60" long-name="Service Controllers">
 <unit bldFile="/sf/mw/remoteconn/connectivitymodules/secon/group"/>
@@ -108,6 +108,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -283,6 +283,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/remotestorage/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/remotestorage/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
+ <systemModel>
+  <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
 <collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
 <component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
 <unit bldFile="/sf/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
@@ -93,6 +93,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/securitysrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/securitysrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/serviceapi/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/serviceapi/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/serviceapifw/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/serviceapifw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/shortlinkconn/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/shortlinkconn/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/srvdiscovery/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/srvdiscovery/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="upnpstack_plat" 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/CompilerCompatibility/mw/svgt/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/svgt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/uiaccelerator/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/uiaccelerator/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -84,6 +84,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/uiresources/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/uiresources/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/uitools/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/uitools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/usbservices/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/usbservices/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -146,6 +146,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/videoutils/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/videoutils/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -83,6 +83,6 @@
 </collection>
 <collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/vpnclient/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/vpnclient/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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">
@@ -181,6 +181,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/web/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/web/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -290,6 +290,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/mw/websrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/websrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -111,6 +111,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/os/boardsupport/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/boardsupport/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/bt/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/bt/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/buildtools/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/buildtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/cellularsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/cellularsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -168,6 +168,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/os/commsfw/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/commsfw/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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">
@@ -168,6 +168,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/os/devicesrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/devicesrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/graphics/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/graphics/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -200,6 +200,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/CompilerCompatibility/os/imagingext/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/imagingext/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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 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/CompilerCompatibility/os/lbs/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/mm/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/mm/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/networkingsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/networkingsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -180,6 +180,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/os/osrndtools/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/osrndtools/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/ossrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/ossrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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"/>
@@ -449,6 +449,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/os/persistentdata/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/persistentdata/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/security/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/security/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="authorisation" long-name="Authorisation" level="utilities">
 <component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
 <unit bldFile="/sf/os/security/authorisation/userpromptservice/group" mrp="/sf/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
@@ -129,6 +129,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/os/textandloc/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/textandloc/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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 Utility API" filter="s60" class="api">
 <unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/group"/>
@@ -150,6 +150,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/CompilerCompatibility/os/usb/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/usb/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/wlan/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/wlan/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/CompilerCompatibility/os/xmlsrv/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/CompilerCompatibility/os/xmlsrv/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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

--- a/symbian3/adaptation/beagleboard/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/symbian3/adaptation/beagleboard/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/symbian3/adaptation/qemu/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/symbian3/adaptation/qemu/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,15 +51,15 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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/symbian3/adaptation/stubs/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/symbian3/adaptation/stubs/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" long-name="Stubs" levels="stub">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="stubs" level="high" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
 <unit bldFile="/sf/adaptation/stubs/audiostubs/group"/>
@@ -90,6 +90,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian3/app/camera/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/symbian3/app/camera/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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="camera_plat" long-name="Camera Apps Platform Interfaces">
 <component name="camcorder_ui_constants_api" long-name="Camcorder UI Constants API" filter="s60" class="api">
 <unit bldFile="/sf/app/camera/camera_plat/camcorder_ui_constants_api/group"/>
@@ -73,6 +73,6 @@
 </collection>
 <collection name="camera_info" long-name="Camera Apps Info"/>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian3/app/commonemail/package_definition.xml	Wed Jun 09 13:33:54 2010 +0100
+++ b/symbian3/app/commonemail/package_definition.xml	Fri Jun 11 15:15:32 2010 +0100
@@ -51,9 +51,9 @@
   priority CDATA #IMPLIED>
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
-<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">
 <collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
 <component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
 <unit bldFile="/sf/app/commonemail/email_pub/email_widget_api/group"/>
@@ -201,6 +201,6 @@
 </component>
 </collection>
 </block>
-</layer>
-</systemModel>
+  </layer>
+ </systemModel>
 </SystemDefinition>
\ No newline at end of file