# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1284652995 -3600
# Node ID 2b5206a690f55247f2903ee7524f4ec447a6709d
# Parent  898dbc98fe98728a362fa7669d24f0b4436df78b
Update package models from latest system model  (platform@48ad07c2132c)

diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/adaptation/beagleboard/package_definition.xml
--- a/symbian4/adaptation/beagleboard/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/adaptation/beagleboard/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/adaptation/codecs.aricent/package_definition.xml
--- a/symbian4/adaptation/codecs.aricent/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/adaptation/codecs.aricent/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="codecs.aricent" level="low" levels="util plugin" long-name="Aricent Codecs">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/adaptation/openmaxil.nokia/package_definition.xml
--- a/symbian4/adaptation/openmaxil.nokia/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/adaptation/openmaxil.nokia/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="openmaxil.nokia" level="mw" levels="adaptation hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/adaptation/qemu/package_definition.xml
--- a/symbian4/adaptation/qemu/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/adaptation/qemu/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/adaptation/stubs/package_definition.xml
--- a/symbian4/adaptation/stubs/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/adaptation/stubs/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/browserui/package_definition.xml
--- a/symbian4/app/browserui/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="browserui" level="services" levels="utils support ui" long-name="Browser UI">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/calendarwidget/package_definition.xml
--- a/symbian4/app/calendarwidget/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/calendarwidget/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="calendarwidget" level="apps" levels="build app" long-name="Calendar Widget">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/camera/package_definition.xml
--- a/symbian4/app/camera/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/camera/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="camera" level="apps" long-name="Camera Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="commonemail" level="apps" span="2" levels="service support ui app" long-name="Email Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/conntools/package_definition.xml
--- a/symbian4/app/conntools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/conntools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="conntools" level="services" levels="config app" long-name="Connectivity Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/contacts/package_definition.xml
--- a/symbian4/app/contacts/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contacts" level="apps" span="2" levels="engine support services plugin ui" long-name="Contacts Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/contentcontrol/package_definition.xml
--- a/symbian4/app/contentcontrol/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contentcontrol" level="services" levels="plugin framework app" long-name="Content Control Daemons">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/devicecontrol/package_definition.xml
--- a/symbian4/app/devicecontrol/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="devicecontrol" level="services" levels="support mid app" long-name="Device Control Daemons">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/files/package_definition.xml
--- a/symbian4/app/files/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/files/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="files" level="apps" levels="support apps" long-name="File Manager Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/firsttimeuse/package_definition.xml
--- a/symbian4/app/firsttimeuse/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="firsttimeuse" level="apps" levels="support services ui app" long-name="First Time Use">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/helps/package_definition.xml
--- a/symbian4/app/helps/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/helps/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="helps" level="apps" span="2" levels="eng tools if ui" long-name="Help Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/homescreen/package_definition.xml
--- a/symbian4/app/homescreen/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="homescreen" level="apps" levels="support task ss hs" long-name="Home Screen Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/imgeditor/package_definition.xml
--- a/symbian4/app/imgeditor/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/imgeditor/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="imgeditor" level="apps" long-name="Image Editor"/>
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/internetradio/package_definition.xml
--- a/symbian4/app/internetradio/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/internetradio/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="internetradio" level="apps" levels="engine server ui" long-name="Internet Radio Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/jrt/package_definition.xml
--- a/symbian4/app/jrt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="jrt" level="services" levels="util generic rt ui" long-name="Java Runtime">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/location/package_definition.xml
--- a/symbian4/app/location/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/location/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="location" level="apps" levels="ui events loc api" long-name="Location Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/messaging/package_definition.xml
--- a/symbian4/app/messaging/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="messaging" level="apps" span="2" levels="plugin eng base app api" long-name="Messaging Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/musicplayer/package_definition.xml
--- a/symbian4/app/musicplayer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="musicplayer" level="apps" levels="plugins support engine app" long-name="Music Player Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/organizer/package_definition.xml
--- a/symbian4/app/organizer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="organizer" level="apps" span="2" levels="support services engine ui app" long-name="Organizer Application Suite">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="phone" level="apps" span="2" levels="engine plugin ui app" long-name="Phone Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/photos/package_definition.xml
--- a/symbian4/app/photos/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="photos" level="apps" levels="util support ui app" long-name="Photos">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/podcatcher/package_definition.xml
--- a/symbian4/app/podcatcher/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/podcatcher/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="podcatcher" level="apps" levels="app" long-name="Podcatcher">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/printing/package_definition.xml
--- a/symbian4/app/printing/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/printing/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="printing" level="services" long-name="Printing"/>
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/radio/package_definition.xml
--- a/symbian4/app/radio/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="radio" level="apps" levels="engine plugin ui" long-name="Radio Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/recents/package_definition.xml
--- a/symbian4/app/recents/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/recents/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="recents" level="apps" levels="engine support ui api" long-name="Recent Events">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/rndtools/package_definition.xml
--- a/symbian4/app/rndtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="rndtools" level="services" levels="support generic test util" long-name="R&amp;D tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/search/package_definition.xml
--- a/symbian4/app/search/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/search/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="search" level="apps" levels="eng base app api" long-name="Search Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/settingsuis/package_definition.xml
--- a/symbian4/app/settingsuis/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/settingsuis/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="settingsuis" level="services" levels="plugin ui" long-name="Settings UIs">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/techview/package_definition.xml
--- a/symbian4/app/techview/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/techview/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="techview" level="apps" span="2" levels="services ui utils apps1 apps2 apps3" long-name="Techview">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/videoeditor/package_definition.xml
--- a/symbian4/app/videoeditor/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/videoeditor/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videoeditor" level="apps" long-name="Video Editor"/>
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/app/videoplayer/package_definition.xml
--- a/symbian4/app/videoplayer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videoplayer" level="apps" levels="support plugin util apps" long-name="Video Player Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/accesssec/package_definition.xml
--- a/symbian4/mw/accesssec/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="accesssec" level="generic" levels="plugin framework server generic specific" long-name="Access Security">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appinstall" level="generic" levels="tool framework generic api" long-name="Application Installation">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/appsupport/package_definition.xml
--- a/symbian4/mw/appsupport/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appsupport" level="generic" levels="system plugin framework server generic specific" long-name="Generic Application Support">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/browser/package_definition.xml
--- a/symbian4/mw/browser/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="browser" level="specific" levels="plugin utils support main" long-name="Browser">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/btservices/package_definition.xml
--- a/symbian4/mw/btservices/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="btservices" level="generic" levels="framework server generic specific plugin" long-name="Bluetooth Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/camerasrv/package_definition.xml
--- a/symbian4/mw/camerasrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="camerasrv" level="specific" levels="plugin fw api" long-name="Camera Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/classicui/package_definition.xml
--- a/symbian4/mw/classicui/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="classicui" level="generic" levels="base support server generic specific" long-name="Classic UI">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/dlnasrv/package_definition.xml
--- a/symbian4/mw/dlnasrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/dlnasrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="dlnasrv" level="specific" levels="stack server ctrl framework plugin" long-name="DLNA Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/drm/package_definition.xml
--- a/symbian4/mw/drm/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="drm" level="generic" levels="plugin framework server generic specific" long-name="DRM">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/gsprofilesrv/package_definition.xml
--- a/symbian4/mw/gsprofilesrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="gsprofilesrv" level="generic" levels="system plugin framework server generic specific" long-name="General Settings and Profiles Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/gstreamer/package_definition.xml
--- a/symbian4/mw/gstreamer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/gstreamer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="gstreamer" level="generic" levels="plugin core api" long-name="GStreamer">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/hapticsservices/package_definition.xml
--- a/symbian4/mw/hapticsservices/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/hapticsservices/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hapticsservices" level="generic" levels="fw server api" long-name="Haptics Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/hb/package_definition.xml
--- a/symbian4/mw/hb/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/hb/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hb" level="generic" levels="engine test api" long-name="Orbit">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/helix/package_definition.xml
--- a/symbian4/mw/helix/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/helix/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="helix" level="generic" levels="plugin framework server generic specific" long-name="Helix">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/hgwidgets/package_definition.xml
--- a/symbian4/mw/hgwidgets/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hgwidgets" level="specific" levels="framework service api" long-name="Multimedia Widgets">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="homescreensrv" level="specific" levels="plugin framework server generic specific" long-name="Home Screen Services">
@@ -93,10 +93,10 @@
 <unit bldFile="/sf/mw/homescreensrv/activityfw" proFile="activityfw.pro" qmakeArgs="-r"/>
 </component>
 </collection>
-<collection name="tstaskmonitor" long-name="Task Switcher Task Monitor" level="fw">
+<collection name="taskswitcher" long-name="Task Switcher" level="fw">
 <!-- move collection down to a component directory or split up into component .pro files -->
-<component name="tstaskmonitor_build" long-name="Task Switcher Task Monitor Build" introduced="^4" purpose="optional">
-<unit bldFile="/sf/mw/homescreensrv/tstaskmonitor" proFile="tstaskmonitor.pro" qmakeArgs="-r"/>
+<component name="taskswitcher_build" long-name="Task Switcher Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/taskswitcher" proFile="taskswitcher.pro"/>
 </component>
 </collection>
 <collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/homescreensrvlegacy/package_definition.xml
--- a/symbian4/mw/homescreensrvlegacy/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/homescreensrvlegacy/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="homescreensrvlegacy" level="generic" levels="plugin framework server generic specific" long-name="Legacy Home Screen Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/imghandling/package_definition.xml
--- a/symbian4/mw/imghandling/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imghandling" level="specific" levels="lib util if" long-name="Image Handling">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/imsrv/package_definition.xml
--- a/symbian4/mw/imsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/imsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imsrv" level="specific" levels="plugin framework server generic specific" long-name="Instant Messaging and Presence Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/inputmethods/package_definition.xml
--- a/symbian4/mw/inputmethods/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="inputmethods" level="generic" levels="plugin engine framework api" long-name="Input Methods">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/ipappprotocols/package_definition.xml
--- a/symbian4/mw/ipappprotocols/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappprotocols" level="generic" levels="plugin conn server if" long-name="IP App Protocols">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/ipappsrv/package_definition.xml
--- a/symbian4/mw/ipappsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/ipappsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappsrv" level="specific" levels="framework generic server conn plugin" long-name="IP App Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipconnmgmt" level="generic" levels="plugin framework server utils api" long-name="IP Connectivity Management">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/legacypresence/package_definition.xml
--- a/symbian4/mw/legacypresence/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="legacypresence" level="specific" levels="engine fw ui" long-name="Legacy Presence Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/locationsrv/package_definition.xml
--- a/symbian4/mw/locationsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="locationsrv" level="specific" levels="plugin fw server if" long-name="Location Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/mds/package_definition.xml
--- a/symbian4/mw/mds/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mds" level="specific" levels="mgr eng server int" long-name="Metadata Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/messagingmw/package_definition.xml
--- a/symbian4/mw/messagingmw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/messagingmw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="messagingmw" level="specific" levels="stack support fw api" long-name="Messaging Middleware">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/metadatasrv/package_definition.xml
--- a/symbian4/mw/metadatasrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/metadatasrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="metadatasrv" level="specific" levels="plugin framework server generic specific" long-name="Legacy Metadata Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/mmappfw/package_definition.xml
--- a/symbian4/mw/mmappfw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmappfw" level="specific" levels="fw utils if" long-name="Multimedia App Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/mmmw/package_definition.xml
--- a/symbian4/mw/mmmw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmmw" level="generic" levels="plugin framework server generic specific" long-name="Multimedia Middleware">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/netprotocols/package_definition.xml
--- a/symbian4/mw/netprotocols/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/netprotocols/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="netprotocols" level="generic" levels="plugin framework server generic specific" long-name="High-level Internet Protocols">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/phonesrv/package_definition.xml
--- a/symbian4/mw/phonesrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="phonesrv" level="specific" levels="utils framework server ui specific" long-name="Telephony and SIM Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/platformthemes/package_definition.xml
--- a/symbian4/mw/platformthemes/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/platformthemes/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="platformthemes" level="specific" levels="framework generic ui" long-name="Platform Themes">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/platformtools/package_definition.xml
--- a/symbian4/mw/platformtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/platformtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="platformtools" level="generic" long-name="Platform Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/qt/package_definition.xml
--- a/symbian4/mw/qt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qt" level="generic" levels="tool mw app" long-name="Qt">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/qtextensions/package_definition.xml
--- a/symbian4/mw/qtextensions/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qtextensions" level="generic" levels="tool mw app" long-name="Qt Extensions">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/qtmobility/package_definition.xml
--- a/symbian4/mw/qtmobility/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/qtmobility/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qtmobility" level="generic" levels="tool mw app" long-name="Qt Mobility">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/remoteconn/package_definition.xml
--- a/symbian4/mw/remoteconn/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/remoteconn/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remoteconn" level="generic" levels="plugin framework server generic specific" long-name="Remote Connectivity">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remotemgmt" level="specific" levels="plugin framework server generic specific" long-name="Remote Management">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/searchsrv/package_definition.xml
--- a/symbian4/mw/searchsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="searchsrv" level="specific" levels="services engine generic api" long-name="Search Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/securitysrv/package_definition.xml
--- a/symbian4/mw/securitysrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="securitysrv" level="generic" levels="plugin framework server generic specific" long-name="Security Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/serviceapi/package_definition.xml
--- a/symbian4/mw/serviceapi/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/serviceapi/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapi" level="specific" levels="os mw1 mw2 app" long-name="Service API">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/serviceapifw/package_definition.xml
--- a/symbian4/mw/serviceapifw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/serviceapifw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapifw" level="specific" levels="plugin framework server generic specific" long-name="Service API Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/socialmobilefw/package_definition.xml
--- a/symbian4/mw/socialmobilefw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/socialmobilefw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="socialmobilefw" level="specific" long-name="Social Mobile Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/srvdiscovery/package_definition.xml
--- a/symbian4/mw/srvdiscovery/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="srvdiscovery" level="generic" levels="plugin framework server generic specific" long-name="Service Discovery and Usage">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/svgt/package_definition.xml
--- a/symbian4/mw/svgt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/svgt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="svgt" level="generic" levels="util ui" long-name="SVG Tiny">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/uiaccelerator/package_definition.xml
--- a/symbian4/mw/uiaccelerator/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/uiaccelerator/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiaccelerator" level="generic" levels="plugin framework server ex if" long-name="UI Accelerator">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/uiresources/package_definition.xml
--- a/symbian4/mw/uiresources/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/uiresources/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiresources" level="generic" levels="compile plugin framework server generic data" long-name="UI Resources">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/uitools/package_definition.xml
--- a/symbian4/mw/uitools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/uitools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uitools" level="specific" levels="compile encode tool if" long-name="UI Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/usbservices/package_definition.xml
--- a/symbian4/mw/usbservices/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="usbservices" level="generic" levels="framework server generic specific plugin" long-name="USB Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/videoutils/package_definition.xml
--- a/symbian4/mw/videoutils/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/videoutils/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="videoutils" level="specific" levels="eng util if" long-name="Video Utils">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/vpnclient/package_definition.xml
--- a/symbian4/mw/vpnclient/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="vpnclient" level="specific" levels="engine ui api" long-name="VPN Client">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="web" level="specific" levels="plugin utils server generic specific" long-name="Web">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/webruntime/package_definition.xml
--- a/symbian4/mw/webruntime/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/webruntime/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="webruntime" level="specific" long-name="Web Runtime">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/websrv/package_definition.xml
--- a/symbian4/mw/websrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/websrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="websrv" level="generic" levels="plugin framework server generic specific" long-name="Web Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/mw/wirelessacc/package_definition.xml
--- a/symbian4/mw/wirelessacc/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="wirelessacc" level="specific" levels="framework generic ui" long-name="Wireless Access">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/boardsupport/package_definition.xml
--- a/symbian4/os/boardsupport/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/boardsupport/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="boardsupport" level="hw" levels="bsp test 2 3 config" long-name="Board Support">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/bt/package_definition.xml
--- a/symbian4/os/bt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/bt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/buildtools/package_definition.xml
--- a/symbian4/os/buildtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/buildtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="buildtools" level="hw" levels="bld mw fw ui" long-name="Build Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/cellularsrv/package_definition.xml
--- a/symbian4/os/cellularsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/commsfw/package_definition.xml
--- a/symbian4/os/commsfw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/commsfw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="commsfw" level="services" levels="server support framework process app-if" long-name="Communications Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/deviceplatformrelease/package_definition.xml
--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="deviceplatformrelease" level="services" levels="bld mid top" long-name="Device Platform Release">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/devicesrv/package_definition.xml
--- a/symbian4/os/devicesrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/graphics/package_definition.xml
--- a/symbian4/os/graphics/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/imagingext/package_definition.xml
--- a/symbian4/os/imagingext/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/imagingext/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/kernelhwsrv/package_definition.xml
--- a/symbian4/os/kernelhwsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/lbs/package_definition.xml
--- a/symbian4/os/lbs/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/mmimaging/package_definition.xml
--- a/symbian4/os/mmimaging/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/mmimaging/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="mmimaging" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia Imaging">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/networkingsrv/package_definition.xml
--- a/symbian4/os/networkingsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/networkingsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/openmaxil/package_definition.xml
--- a/symbian4/os/openmaxil/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/openmaxil/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="openmaxil" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/osrndtools/package_definition.xml
--- a/symbian4/os/osrndtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="osrndtools" level="services" levels="fw trace analysis" long-name="OS R&amp;D tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/ossrv/package_definition.xml
--- a/symbian4/os/ossrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="ossrv" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities" long-name="Generic OS Services">
@@ -161,9 +161,6 @@
 </component>
 </collection>
 <collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" long-name="Z Compression Library" filter="s60" purpose="optional">
-<unit bldFile="/sf/os/ossrv/stdlibs/libz/group"/>
-</component>
 <component name="libcrypt" long-name="Crypt Library" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/stdlibs/libcrypt/group"/>
 </component>
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/ostesttools/package_definition.xml
--- a/symbian4/os/ostesttools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/ostesttools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="ostesttools" level="services" levels="fw trace analysis" long-name="OS Test tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/persistentdata/package_definition.xml
--- a/symbian4/os/persistentdata/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/persistentdata/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/security/package_definition.xml
--- a/symbian4/os/security/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/security/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="security" level="services" levels="physical-abstraction plugins libraries management services utilities" long-name="OS Security">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/textandloc/package_definition.xml
--- a/symbian4/os/textandloc/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/textandloc/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="textandloc" level="services" levels="encoding util fonts tools text" long-name="Text and Localisation Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/usb/package_definition.xml
--- a/symbian4/os/usb/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/usb/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/wlan/package_definition.xml
--- a/symbian4/os/wlan/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/wlan/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="wlan" level="services" levels="hw low mid high tools test" long-name="WLAN">
diff -r 898dbc98fe98 -r 2b5206a690f5 symbian4/os/xmlsrv/package_definition.xml
--- a/symbian4/os/xmlsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/symbian4/os/xmlsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="xmlsrv" level="services" levels="plugin server framework generic specific" long-name="XML Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/adaptation/beagleboard/package_definition.xml
--- a/tip_pbc/adaptation/beagleboard/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/adaptation/beagleboard/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/adaptation/codecs.aricent/package_definition.xml
--- a/tip_pbc/adaptation/codecs.aricent/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/adaptation/codecs.aricent/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="codecs.aricent" level="low" levels="util plugin" long-name="Aricent Codecs">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/adaptation/openmaxil.nokia/package_definition.xml
--- a/tip_pbc/adaptation/openmaxil.nokia/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/adaptation/openmaxil.nokia/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="openmaxil.nokia" level="mw" levels="adaptation hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/adaptation/qemu/package_definition.xml
--- a/tip_pbc/adaptation/qemu/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/adaptation/qemu/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/adaptation/stubs/package_definition.xml
--- a/tip_pbc/adaptation/stubs/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/adaptation/stubs/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/browserui/package_definition.xml
--- a/tip_pbc/app/browserui/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/browserui/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="browserui" level="services" levels="utils support ui" long-name="Browser UI">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/calendarwidget/package_definition.xml
--- a/tip_pbc/app/calendarwidget/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/calendarwidget/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="calendarwidget" level="apps" levels="build app" long-name="Calendar Widget">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/camera/package_definition.xml
--- a/tip_pbc/app/camera/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/camera/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="camera" level="apps" long-name="Camera Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/commonemail/package_definition.xml
--- a/tip_pbc/app/commonemail/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/commonemail/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="commonemail" level="apps" span="2" levels="service support ui app" long-name="Email Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/conntools/package_definition.xml
--- a/tip_pbc/app/conntools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/conntools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="conntools" level="services" levels="config app" long-name="Connectivity Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/contacts/package_definition.xml
--- a/tip_pbc/app/contacts/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/contacts/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contacts" level="apps" span="2" levels="engine support services plugin ui" long-name="Contacts Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/contentcontrol/package_definition.xml
--- a/tip_pbc/app/contentcontrol/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/contentcontrol/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contentcontrol" level="services" levels="plugin framework app" long-name="Content Control Daemons">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/devicecontrol/package_definition.xml
--- a/tip_pbc/app/devicecontrol/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/devicecontrol/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="devicecontrol" level="services" levels="support mid app" long-name="Device Control Daemons">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/files/package_definition.xml
--- a/tip_pbc/app/files/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/files/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="files" level="apps" levels="support apps" long-name="File Manager Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/firsttimeuse/package_definition.xml
--- a/tip_pbc/app/firsttimeuse/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/firsttimeuse/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="firsttimeuse" level="apps" levels="support services ui app" long-name="First Time Use">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/helps/package_definition.xml
--- a/tip_pbc/app/helps/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/helps/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="helps" level="apps" span="2" levels="eng tools if ui" long-name="Help Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/homescreen/package_definition.xml
--- a/tip_pbc/app/homescreen/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/homescreen/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="homescreen" level="apps" levels="support task ss hs" long-name="Home Screen Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/imgeditor/package_definition.xml
--- a/tip_pbc/app/imgeditor/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/imgeditor/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="imgeditor" level="apps" long-name="Image Editor"/>
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/internetradio/package_definition.xml
--- a/tip_pbc/app/internetradio/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/internetradio/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="internetradio" level="apps" levels="engine server ui" long-name="Internet Radio Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/jrt/package_definition.xml
--- a/tip_pbc/app/jrt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/jrt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="jrt" level="services" levels="util generic rt ui" long-name="Java Runtime">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/location/package_definition.xml
--- a/tip_pbc/app/location/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/location/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="location" level="apps" levels="ui events loc api" long-name="Location Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/messaging/package_definition.xml
--- a/tip_pbc/app/messaging/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/messaging/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="messaging" level="apps" span="2" levels="plugin eng base app api" long-name="Messaging Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/musicplayer/package_definition.xml
--- a/tip_pbc/app/musicplayer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/musicplayer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="musicplayer" level="apps" levels="plugins support engine app" long-name="Music Player Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/organizer/package_definition.xml
--- a/tip_pbc/app/organizer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/organizer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="organizer" level="apps" span="2" levels="support services engine ui app" long-name="Organizer Application Suite">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/phone/package_definition.xml
--- a/tip_pbc/app/phone/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/phone/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="phone" level="apps" span="2" levels="engine plugin ui app" long-name="Phone Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/photos/package_definition.xml
--- a/tip_pbc/app/photos/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/photos/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="photos" level="apps" levels="util support ui app" long-name="Photos">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/podcatcher/package_definition.xml
--- a/tip_pbc/app/podcatcher/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/podcatcher/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="podcatcher" level="apps" levels="app" long-name="Podcatcher">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/printing/package_definition.xml
--- a/tip_pbc/app/printing/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/printing/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="printing" level="services" long-name="Printing"/>
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/radio/package_definition.xml
--- a/tip_pbc/app/radio/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/radio/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="radio" level="apps" levels="engine plugin ui" long-name="Radio Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/recents/package_definition.xml
--- a/tip_pbc/app/recents/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/recents/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="recents" level="apps" levels="engine support ui api" long-name="Recent Events">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/rndtools/package_definition.xml
--- a/tip_pbc/app/rndtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/rndtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="rndtools" level="services" levels="support generic test util" long-name="R&amp;D tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/search/package_definition.xml
--- a/tip_pbc/app/search/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/search/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="search" level="apps" levels="eng base app api" long-name="Search Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/settingsuis/package_definition.xml
--- a/tip_pbc/app/settingsuis/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/settingsuis/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="settingsuis" level="services" levels="plugin ui" long-name="Settings UIs">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/techview/package_definition.xml
--- a/tip_pbc/app/techview/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/techview/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="techview" level="apps" span="2" levels="services ui utils apps1 apps2 apps3" long-name="Techview">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/videoeditor/package_definition.xml
--- a/tip_pbc/app/videoeditor/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/videoeditor/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videoeditor" level="apps" long-name="Video Editor"/>
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/app/videoplayer/package_definition.xml
--- a/tip_pbc/app/videoplayer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/app/videoplayer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videoplayer" level="apps" levels="support plugin util apps" long-name="Video Player Apps">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/accesssec/package_definition.xml
--- a/tip_pbc/mw/accesssec/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/accesssec/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="accesssec" level="generic" levels="plugin framework server generic specific" long-name="Access Security">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/appinstall/package_definition.xml
--- a/tip_pbc/mw/appinstall/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/appinstall/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appinstall" level="generic" levels="tool framework generic api" long-name="Application Installation">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/appsupport/package_definition.xml
--- a/tip_pbc/mw/appsupport/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/appsupport/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appsupport" level="generic" levels="system plugin framework server generic specific" long-name="Generic Application Support">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/browser/package_definition.xml
--- a/tip_pbc/mw/browser/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/browser/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="browser" level="specific" levels="plugin utils support main" long-name="Browser">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/btservices/package_definition.xml
--- a/tip_pbc/mw/btservices/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/btservices/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="btservices" level="generic" levels="framework server generic specific plugin" long-name="Bluetooth Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/camerasrv/package_definition.xml
--- a/tip_pbc/mw/camerasrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/camerasrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="camerasrv" level="specific" levels="plugin fw api" long-name="Camera Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/classicui/package_definition.xml
--- a/tip_pbc/mw/classicui/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/classicui/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="classicui" level="generic" levels="base support server generic specific" long-name="Classic UI">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/dlnasrv/package_definition.xml
--- a/tip_pbc/mw/dlnasrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/dlnasrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="dlnasrv" level="specific" levels="stack server ctrl framework plugin" long-name="DLNA Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/drm/package_definition.xml
--- a/tip_pbc/mw/drm/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/drm/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="drm" level="generic" levels="plugin framework server generic specific" long-name="DRM">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/gsprofilesrv/package_definition.xml
--- a/tip_pbc/mw/gsprofilesrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/gsprofilesrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="gsprofilesrv" level="generic" levels="system plugin framework server generic specific" long-name="General Settings and Profiles Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/gstreamer/package_definition.xml
--- a/tip_pbc/mw/gstreamer/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/gstreamer/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="gstreamer" level="generic" levels="plugin core api" long-name="GStreamer">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/hapticsservices/package_definition.xml
--- a/tip_pbc/mw/hapticsservices/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/hapticsservices/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hapticsservices" level="generic" levels="fw server api" long-name="Haptics Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/hb/package_definition.xml
--- a/tip_pbc/mw/hb/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/hb/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hb" level="generic" levels="engine test api" long-name="Orbit">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/helix/package_definition.xml
--- a/tip_pbc/mw/helix/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/helix/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="helix" level="generic" levels="plugin framework server generic specific" long-name="Helix">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/hgwidgets/package_definition.xml
--- a/tip_pbc/mw/hgwidgets/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/hgwidgets/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hgwidgets" level="specific" levels="framework service api" long-name="Multimedia Widgets">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/homescreensrv/package_definition.xml
--- a/tip_pbc/mw/homescreensrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/homescreensrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="homescreensrv" level="specific" levels="plugin framework server generic specific" long-name="Home Screen Services">
@@ -93,10 +93,10 @@
 <unit bldFile="/sf/mw/homescreensrv/activityfw" proFile="activityfw.pro" qmakeArgs="-r"/>
 </component>
 </collection>
-<collection name="tstaskmonitor" long-name="Task Switcher Task Monitor" level="fw">
+<collection name="taskswitcher" long-name="Task Switcher" level="fw">
 <!-- move collection down to a component directory or split up into component .pro files -->
-<component name="tstaskmonitor_build" long-name="Task Switcher Task Monitor Build" introduced="^4" purpose="optional">
-<unit bldFile="/sf/mw/homescreensrv/tstaskmonitor" proFile="tstaskmonitor.pro" qmakeArgs="-r"/>
+<component name="taskswitcher_build" long-name="Task Switcher Build" introduced="^4" purpose="optional">
+<unit bldFile="/sf/mw/homescreensrv/taskswitcher" proFile="taskswitcher.pro"/>
 </component>
 </collection>
 <collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/homescreensrvlegacy/package_definition.xml
--- a/tip_pbc/mw/homescreensrvlegacy/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/homescreensrvlegacy/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="homescreensrvlegacy" level="generic" levels="plugin framework server generic specific" long-name="Legacy Home Screen Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/imghandling/package_definition.xml
--- a/tip_pbc/mw/imghandling/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/imghandling/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imghandling" level="specific" levels="lib util if" long-name="Image Handling">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/imsrv/package_definition.xml
--- a/tip_pbc/mw/imsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/imsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imsrv" level="specific" levels="plugin framework server generic specific" long-name="Instant Messaging and Presence Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/inputmethods/package_definition.xml
--- a/tip_pbc/mw/inputmethods/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/inputmethods/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="inputmethods" level="generic" levels="plugin engine framework api" long-name="Input Methods">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/ipappprotocols/package_definition.xml
--- a/tip_pbc/mw/ipappprotocols/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/ipappprotocols/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappprotocols" level="generic" levels="plugin conn server if" long-name="IP App Protocols">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/ipappsrv/package_definition.xml
--- a/tip_pbc/mw/ipappsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/ipappsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappsrv" level="specific" levels="framework generic server conn plugin" long-name="IP App Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/ipconnmgmt/package_definition.xml
--- a/tip_pbc/mw/ipconnmgmt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/ipconnmgmt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipconnmgmt" level="generic" levels="plugin framework server utils api" long-name="IP Connectivity Management">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/legacypresence/package_definition.xml
--- a/tip_pbc/mw/legacypresence/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/legacypresence/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="legacypresence" level="specific" levels="engine fw ui" long-name="Legacy Presence Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/locationsrv/package_definition.xml
--- a/tip_pbc/mw/locationsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/locationsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="locationsrv" level="specific" levels="plugin fw server if" long-name="Location Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/mds/package_definition.xml
--- a/tip_pbc/mw/mds/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/mds/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mds" level="specific" levels="mgr eng server int" long-name="Metadata Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/messagingmw/package_definition.xml
--- a/tip_pbc/mw/messagingmw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/messagingmw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="messagingmw" level="specific" levels="stack support fw api" long-name="Messaging Middleware">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/metadatasrv/package_definition.xml
--- a/tip_pbc/mw/metadatasrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/metadatasrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="metadatasrv" level="specific" levels="plugin framework server generic specific" long-name="Legacy Metadata Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/mmappfw/package_definition.xml
--- a/tip_pbc/mw/mmappfw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/mmappfw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmappfw" level="specific" levels="fw utils if" long-name="Multimedia App Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/mmmw/package_definition.xml
--- a/tip_pbc/mw/mmmw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/mmmw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmmw" level="generic" levels="plugin framework server generic specific" long-name="Multimedia Middleware">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/netprotocols/package_definition.xml
--- a/tip_pbc/mw/netprotocols/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/netprotocols/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="netprotocols" level="generic" levels="plugin framework server generic specific" long-name="High-level Internet Protocols">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/phonesrv/package_definition.xml
--- a/tip_pbc/mw/phonesrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/phonesrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="phonesrv" level="specific" levels="utils framework server ui specific" long-name="Telephony and SIM Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/platformthemes/package_definition.xml
--- a/tip_pbc/mw/platformthemes/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/platformthemes/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="platformthemes" level="specific" levels="framework generic ui" long-name="Platform Themes">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/platformtools/package_definition.xml
--- a/tip_pbc/mw/platformtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/platformtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="platformtools" level="generic" long-name="Platform Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/qt/package_definition.xml
--- a/tip_pbc/mw/qt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/qt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qt" level="generic" levels="tool mw app" long-name="Qt">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/qtextensions/package_definition.xml
--- a/tip_pbc/mw/qtextensions/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/qtextensions/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qtextensions" level="generic" levels="tool mw app" long-name="Qt Extensions">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/qtmobility/package_definition.xml
--- a/tip_pbc/mw/qtmobility/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/qtmobility/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qtmobility" level="generic" levels="tool mw app" long-name="Qt Mobility">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/remoteconn/package_definition.xml
--- a/tip_pbc/mw/remoteconn/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/remoteconn/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remoteconn" level="generic" levels="plugin framework server generic specific" long-name="Remote Connectivity">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/remotemgmt/package_definition.xml
--- a/tip_pbc/mw/remotemgmt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/remotemgmt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remotemgmt" level="specific" levels="plugin framework server generic specific" long-name="Remote Management">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/searchsrv/package_definition.xml
--- a/tip_pbc/mw/searchsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/searchsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="searchsrv" level="specific" levels="services engine generic api" long-name="Search Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/securitysrv/package_definition.xml
--- a/tip_pbc/mw/securitysrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/securitysrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="securitysrv" level="generic" levels="plugin framework server generic specific" long-name="Security Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/serviceapi/package_definition.xml
--- a/tip_pbc/mw/serviceapi/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/serviceapi/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapi" level="specific" levels="os mw1 mw2 app" long-name="Service API">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/serviceapifw/package_definition.xml
--- a/tip_pbc/mw/serviceapifw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/serviceapifw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapifw" level="specific" levels="plugin framework server generic specific" long-name="Service API Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/socialmobilefw/package_definition.xml
--- a/tip_pbc/mw/socialmobilefw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/socialmobilefw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="socialmobilefw" level="specific" long-name="Social Mobile Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/srvdiscovery/package_definition.xml
--- a/tip_pbc/mw/srvdiscovery/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/srvdiscovery/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="srvdiscovery" level="generic" levels="plugin framework server generic specific" long-name="Service Discovery and Usage">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/svgt/package_definition.xml
--- a/tip_pbc/mw/svgt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/svgt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="svgt" level="generic" levels="util ui" long-name="SVG Tiny">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/uiaccelerator/package_definition.xml
--- a/tip_pbc/mw/uiaccelerator/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/uiaccelerator/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiaccelerator" level="generic" levels="plugin framework server ex if" long-name="UI Accelerator">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/uiresources/package_definition.xml
--- a/tip_pbc/mw/uiresources/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/uiresources/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiresources" level="generic" levels="compile plugin framework server generic data" long-name="UI Resources">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/uitools/package_definition.xml
--- a/tip_pbc/mw/uitools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/uitools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uitools" level="specific" levels="compile encode tool if" long-name="UI Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/usbservices/package_definition.xml
--- a/tip_pbc/mw/usbservices/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/usbservices/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="usbservices" level="generic" levels="framework server generic specific plugin" long-name="USB Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/videoutils/package_definition.xml
--- a/tip_pbc/mw/videoutils/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/videoutils/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="videoutils" level="specific" levels="eng util if" long-name="Video Utils">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/vpnclient/package_definition.xml
--- a/tip_pbc/mw/vpnclient/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/vpnclient/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="vpnclient" level="specific" levels="engine ui api" long-name="VPN Client">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/web/package_definition.xml
--- a/tip_pbc/mw/web/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/web/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="web" level="specific" levels="plugin utils server generic specific" long-name="Web">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/webruntime/package_definition.xml
--- a/tip_pbc/mw/webruntime/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/webruntime/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="webruntime" level="specific" long-name="Web Runtime">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/websrv/package_definition.xml
--- a/tip_pbc/mw/websrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/websrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="websrv" level="generic" levels="plugin framework server generic specific" long-name="Web Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/mw/wirelessacc/package_definition.xml
--- a/tip_pbc/mw/wirelessacc/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/mw/wirelessacc/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="wirelessacc" level="specific" levels="framework generic ui" long-name="Wireless Access">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/boardsupport/package_definition.xml
--- a/tip_pbc/os/boardsupport/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/boardsupport/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="boardsupport" level="hw" levels="bsp test 2 3 config" long-name="Board Support">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/bt/package_definition.xml
--- a/tip_pbc/os/bt/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/bt/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/buildtools/package_definition.xml
--- a/tip_pbc/os/buildtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/buildtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="buildtools" level="hw" levels="bld mw fw ui" long-name="Build Tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/cellularsrv/package_definition.xml
--- a/tip_pbc/os/cellularsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/cellularsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/commsfw/package_definition.xml
--- a/tip_pbc/os/commsfw/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/commsfw/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="commsfw" level="services" levels="server support framework process app-if" long-name="Communications Framework">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/deviceplatformrelease/package_definition.xml
--- a/tip_pbc/os/deviceplatformrelease/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/deviceplatformrelease/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="deviceplatformrelease" level="services" levels="bld mid top" long-name="Device Platform Release">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/devicesrv/package_definition.xml
--- a/tip_pbc/os/devicesrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/devicesrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/graphics/package_definition.xml
--- a/tip_pbc/os/graphics/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/graphics/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/imagingext/package_definition.xml
--- a/tip_pbc/os/imagingext/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/imagingext/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/kernelhwsrv/package_definition.xml
--- a/tip_pbc/os/kernelhwsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/kernelhwsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/lbs/package_definition.xml
--- a/tip_pbc/os/lbs/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/lbs/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/mm/package_definition.xml
--- a/tip_pbc/os/mm/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/mm/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/mmimaging/package_definition.xml
--- a/tip_pbc/os/mmimaging/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/mmimaging/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="mmimaging" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia Imaging">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/networkingsrv/package_definition.xml
--- a/tip_pbc/os/networkingsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/networkingsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/openmaxil/package_definition.xml
--- a/tip_pbc/os/openmaxil/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/openmaxil/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="openmaxil" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/osrndtools/package_definition.xml
--- a/tip_pbc/os/osrndtools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/osrndtools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="osrndtools" level="services" levels="fw trace analysis" long-name="OS R&amp;D tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/ossrv/package_definition.xml
--- a/tip_pbc/os/ossrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/ossrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="ossrv" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities" long-name="Generic OS Services">
@@ -161,9 +161,6 @@
 </component>
 </collection>
 <collection name="stdlibs" long-name="Standard Libraries" level="translation">
-<component name="libz" long-name="Z Compression Library" filter="s60" purpose="optional">
-<unit bldFile="/sf/os/ossrv/stdlibs/libz/group"/>
-</component>
 <component name="libcrypt" long-name="Crypt Library" filter="s60" purpose="optional">
 <unit bldFile="/sf/os/ossrv/stdlibs/libcrypt/group"/>
 </component>
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/ostesttools/package_definition.xml
--- a/tip_pbc/os/ostesttools/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/ostesttools/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="ostesttools" level="services" levels="fw trace analysis" long-name="OS Test tools">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/persistentdata/package_definition.xml
--- a/tip_pbc/os/persistentdata/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/persistentdata/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/security/package_definition.xml
--- a/tip_pbc/os/security/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/security/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="security" level="services" levels="physical-abstraction plugins libraries management services utilities" long-name="OS Security">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/textandloc/package_definition.xml
--- a/tip_pbc/os/textandloc/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/textandloc/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="textandloc" level="services" levels="encoding util fonts tools text" long-name="Text and Localisation Services">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/usb/package_definition.xml
--- a/tip_pbc/os/usb/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/usb/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/wlan/package_definition.xml
--- a/tip_pbc/os/wlan/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/wlan/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="wlan" level="services" levels="hw low mid high tools test" long-name="WLAN">
diff -r 898dbc98fe98 -r 2b5206a690f5 tip_pbc/os/xmlsrv/package_definition.xml
--- a/tip_pbc/os/xmlsrv/package_definition.xml	Wed Sep 15 18:02:50 2010 +0100
+++ b/tip_pbc/os/xmlsrv/package_definition.xml	Thu Sep 16 17:03:15 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="xmlsrv" level="services" levels="plugin server framework generic specific" long-name="XML Services">