# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1255961827 -3600
# Node ID 5c8ce9368537c4241328d3fb840f637dd555ca1b
# Parent  3e602380d71d598ab44618d414abe202609d9faa# Parent  590e02565f6e1a7b8be377aa69a962a4693f7ea3
catchup merge

diff -r 3e602380d71d -r 5c8ce9368537 .hgtags
--- a/.hgtags	Mon Oct 19 15:15:54 2009 +0100
+++ b/.hgtags	Mon Oct 19 15:17:07 2009 +0100
@@ -2,3 +2,5 @@
 382efd1777cbb6afaa9499882cbd9bffc9035cc9 PDK_2.0.c
 ddd6d0923b22adce25cbff5dd77e4e7db4c71a24 PDK_2.0.d
 f824e7e4b419943f1c8a92ee4ba312a1ff3c638d PDK_2.0.e
+19d9d30fe44fde9c97a30be3788d77ef71b8971a PDK_3.0.a
+b26a6e1e71136c78c1f545299c42ce23e389b636 PDK_2.0.0
diff -r 3e602380d71d -r 5c8ce9368537 symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Mon Oct 19 15:15:54 2009 +0100
+++ b/symbian3/split/sources_fcl.csv	Mon Oct 19 15:17:07 2009 +0100
@@ -92,7 +92,7 @@
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
@@ -101,7 +101,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/oss/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml