# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283439702 -3600
# Node ID c50786bbedec5fef59c7f530878018acc96a8928
# Parent  8cb079868133c4ad1affb4dc8b36f65cd3ebf891# Parent  8e551af32cc5921477c3a9c2c1bcad653ee1f5a0
Merge RCL_3 fixes with reverted delivery

diff -r 8cb079868133 -r c50786bbedec sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Wed Sep 01 12:34:26 2010 +0100
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Sep 02 16:01:42 2010 +0100
@@ -24,8 +24,9 @@
 ./sspluginsgsa.iby			/epoc32/rom/include/sspluginsgsa.iby
 
 PRJ_MMPFILES
-./gsastatepolicystartup.mmp
-./gsastatepolicyshutdown.mmp
+// darios: ssm.state.policy.000n.dll conflicting with s60 version (see bug 2620) (n=0,2,3)
+//./gsastatepolicystartup.mmp
+//./gsastatepolicyshutdown.mmp
 ./gsastatepolicynormal.mmp
-./gsastatepolicyfail.mmp
+//./gsastatepolicyfail.mmp