# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1243438992 -3600
# Node ID b8578044db2c5a5ad31931e688b000ab9cf0d894
# Parent  adf2a2f9044739a5919583b84f44d3adfe4a24dc# Parent  397445103e3b12316b5ab3ad4950800bf00d858c
Merge updates back to platform project

diff -r adf2a2f90447 -r b8578044db2c clean/sources.csv
--- a/clean/sources.csv	Wed May 27 16:36:09 2009 +0100
+++ b/clean/sources.csv	Wed May 27 16:43:12 2009 +0100
@@ -1,5 +1,6 @@
 source,dst,tag,type,branch,pattern
 //lon-engbuild87/d$/mercurial_development/rnd/internal/initial/,/rnd/internal/initial,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,tip,tag,default,layers.sysdef.xml
diff -r adf2a2f90447 -r b8578044db2c clean/sources_fcl.csv
--- a/clean/sources_fcl.csv	Wed May 27 16:36:09 2009 +0100
+++ b/clean/sources_fcl.csv	Wed May 27 16:43:12 2009 +0100
@@ -1,5 +1,6 @@
 source,dst,tag,type,branch,pattern
 //lon-engbuild87/d$/mercurial_development/rnd/internal/initial/,/rnd/internal/initial,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,tip,tag,default,layers.sysdef.xml
@@ -101,7 +102,7 @@
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/security/,/sf/os/security,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/os/shortlinksrv_2/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial/Temp/textandloc/,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial/Temp/sfl/FCL/sf/os/textandloc,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tip,tag,default,layers.sysdef.xml