# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1282561010 -3600
# Node ID 8e551af32cc5921477c3a9c2c1bcad653ee1f5a0
# Parent  1ddbe54d0645e99458eb886c407f36ea69ab2425# Parent  a616a19c9ce0d60fb76f46f50dba8d1cfc1961bd
Merge RCL_3 fixes with latest delivery.

diff -r 1ddbe54d0645 -r 8e551af32cc5 sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Aug 19 11:09:10 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Mon Aug 23 11:56:50 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