# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1250695113 -3600
# Node ID 11a2069166ef63c5f7fcefb7b2469448ab868443
# Parent  d3f1ef6d2469d4f29cc22478cd490309b138ce54# Parent  18257327af146cc3eeee3429a6f06addcdc4293d
catchup merge

diff -r d3f1ef6d2469 -r 11a2069166ef clean/sources.csv
--- a/clean/sources.csv	Wed Aug 19 16:17:29 2009 +0100
+++ b/clean/sources.csv	Wed Aug 19 16:18:33 2009 +0100
@@ -1,8 +1,9 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,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/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
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
@@ -104,14 +105,14 @@
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r d3f1ef6d2469 -r 11a2069166ef clean/sources_fcl.csv
--- a/clean/sources_fcl.csv	Wed Aug 19 16:17:29 2009 +0100
+++ b/clean/sources_fcl.csv	Wed Aug 19 16:18:33 2009 +0100
@@ -1,8 +1,9 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,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/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
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
@@ -104,14 +105,14 @@
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r d3f1ef6d2469 -r 11a2069166ef ex-nokia/sources.csv
--- a/ex-nokia/sources.csv	Wed Aug 19 16:17:29 2009 +0100
+++ b/ex-nokia/sources.csv	Wed Aug 19 16:18:33 2009 +0100
@@ -101,14 +101,14 @@
 //v800008/Builds01/mercurial_master_prod/sfl/sf/os/security/,/sf/os/security,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/sf/os/shortlinksrv/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/sf/os/textandloc/,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/sf/os/unref/,/sf/os/unref,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/sf/os/unref/,/sf/os/unref,tip,tag,default,
 //v800008/Builds01/mercurial_master_prod/sfl/sf/os/wlan/,/sf/os/wlan,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/sf/os/xmlsrv/,/sf/os/xmlsrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/sf/ostools/osrndtools/,/sf/ostools/osrndtools,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/sf/tools/build_s60/,/sf/tools/build_s60,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/sf/tools/buildplatforms/,/sf/tools/buildplatforms,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/sf/tools/build_s60/,/sf/tools/build_s60,tip,tag,default,
+//v800008/Builds01/mercurial_master_prod/sfl/sf/tools/buildplatforms/,/sf/tools/buildplatforms,tip,tag,default,
 //v800008/Builds01/mercurial_master_prod/sfl/sf/tools/homescreentools/,/sf/tools/homescreentools,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/sf/tools/makefile_templates/,/sf/tools/makefile_templates,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/sf/tools/makefile_templates/,/sf/tools/makefile_templates,tip,tag,default,
 //v800008/Builds01/mercurial_master_prod/sfl/sf/tools/platformtools/,/sf/tools/platformtools,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/sf/tools/rndtools/,/sf/tools/rndtools,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/sf/tools/swconfigtools/,/sf/tools/swconfigtools,tip,tag,default,layers.sysdef.xml
diff -r d3f1ef6d2469 -r 11a2069166ef foundation/sources.csv
--- a/foundation/sources.csv	Wed Aug 19 16:17:29 2009 +0100
+++ b/foundation/sources.csv	Wed Aug 19 16:18:33 2009 +0100
@@ -1,8 +1,9 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,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/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
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
@@ -104,14 +105,14 @@
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r d3f1ef6d2469 -r 11a2069166ef foundation/sources_fcl.csv
--- a/foundation/sources_fcl.csv	Wed Aug 19 16:17:29 2009 +0100
+++ b/foundation/sources_fcl.csv	Wed Aug 19 16:18:33 2009 +0100
@@ -2,7 +2,8 @@
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,layers.sysdef.xml
+//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
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
@@ -107,11 +108,11 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,1
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,1
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,1
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,1
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,1
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml