# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1257339877 0
# Node ID 8f983cc39d12eac74a01fa37b3de947d5f44d33d
# Parent  c6c450bf1a731c600bffdebe454ac4ffb78c67a9# Parent  fd235d620c1355dff9f0633d07e65e4f82a4967a
catchup merge

diff -r c6c450bf1a73 -r 8f983cc39d12 symbian2/micro/sources.csv
--- a/symbian2/micro/sources.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian2/micro/sources.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,7 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_1,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian2/single/sources.csv
--- a/symbian2/single/sources.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian2/single/sources.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,7 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_1,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian2/single/sources_fcl.csv
--- a/symbian2/single/sources_fcl.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian2/single/sources_fcl.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,7 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,RCL_1,layers.sysdef.xml
@@ -72,7 +73,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_1,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_1,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,branch,RCL_1,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian2/single/sysdefs/system_model.xml
--- a/symbian2/single/sysdefs/system_model.xml	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian2/single/sysdefs/system_model.xml	Wed Nov 04 13:04:37 2009 +0000
@@ -1083,9 +1083,8 @@
      <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
      </component>
-     <component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
+     <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
      </component>
     </collection>
     <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian2/split/sources.csv
--- a/symbian2/split/sources.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian2/split/sources.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,7 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_1,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian2/split/sources_fcl.csv
--- a/symbian2/split/sources_fcl.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian2/split/sources_fcl.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,7 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,RCL_1,layers.sysdef.xml
@@ -72,7 +73,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_1,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_1,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,branch,RCL_1,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian2/split/sysdefs/system_model_os.xml
--- a/symbian2/split/sysdefs/system_model_os.xml	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian2/split/sysdefs/system_model_os.xml	Wed Nov 04 13:04:37 2009 +0000
@@ -823,7 +823,7 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
-<component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y">
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
 </collection>
@@ -2463,4 +2463,4 @@
     <!-- 9.5 configuration -->
     <!-- 9.6 configuration -->
  <!-- Future configuration -->
-</SystemBuild></SystemDefinition>
\ No newline at end of file
+</SystemBuild></SystemDefinition>
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian3/micro/sources.csv
--- a/symbian3/micro/sources.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian3/micro/sources.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -3,6 +3,7 @@
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian3/single/sources.csv
--- a/symbian3/single/sources.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian3/single/sources.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,7 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian3/single/sources_fcl.csv
--- a/symbian3/single/sources_fcl.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian3/single/sources_fcl.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,7 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
@@ -121,4 +122,4 @@
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
\ No newline at end of file
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian3/split/sources.csv
--- a/symbian3/split/sources.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian3/split/sources.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -3,6 +3,7 @@
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
@@ -121,4 +122,4 @@
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
\ No newline at end of file
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r c6c450bf1a73 -r 8f983cc39d12 symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Wed Nov 04 13:01:29 2009 +0000
+++ b/symbian3/split/sources_fcl.csv	Wed Nov 04 13:04:37 2009 +0000
@@ -2,6 +2,8 @@
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml