diff -r cf9aad5eb1bd -r 87ffa5ec6b1a symbian4/single/sources_bulk.csv
--- a/symbian4/single/sources_bulk.csv	Wed Jun 30 13:34:17 2010 +0100
+++ b/symbian4/single/sources_bulk.csv	Wed Jun 30 13:37:22 2010 +0100
@@ -36,14 +36,14 @@
 http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,093cf0757204,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,tag,tip_bulk,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/browser/,/sf/mw/browser,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/camerasrv/,/sf/mw/camerasrv,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/gstreamer/,/sf/mw/gstreamer,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,tag,tip_bulk,layers.sysdef.xml
@@ -82,7 +82,7 @@
 http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/svgt/,/sf/mw/svgt,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,tag,tip_bulk,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/videoutils/,/sf/mw/videoutils,tag,tip_bulk,layers.sysdef.xml
@@ -93,15 +93,15 @@
 http://developer.symbian.org/oss/FCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/boardsupport/,/sf/os/boardsupport,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/bt/,/sf/os/bt,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tag,tip_bulk,modified-FCL
-http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,tag,tip_bulk,modified-FCL
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,tag,tip_bulk,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,tag,S4_PDK_FIX,
 http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,tag,tip_bulk,layers.sysdef.xml