--- a/clean/sources_fcl.csv	Thu Jul 02 12:40:37 2009 +0100
+++ b/clean/sources_fcl.csv	Tue Jul 07 14:43:57 2009 +0100
@@ -61,10 +61,10 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mds/,/sf/mw/mds,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/mmmw/,/sf/mw/mmmw,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mobiletv/,/sf/mw/mobiletv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,tip,tag,default,layers.sysdef.xml
@@ -92,7 +92,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/devicesrv/,/sf/os/devicesrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,tip,tag,default,layers.sysdef.xml
@@ -102,8 +102,8 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/security/,/sf/os/security,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tip,tag,default,layers.sysdef.xml