# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1284569232 -3600
# Node ID 8cf1a5cd9ade4eea0dd70872b6e588ef5cd76e99
# Parent  09d657f1ee00226c8e9697954e99e77c0371b864# Parent  dd2df52277006991ed6556f29a672275d2038b4b
Remerge workaround for Bug 2620 in S^4 wk34

diff -r 09d657f1ee00 -r 8cf1a5cd9ade sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Sep 02 21:48:26 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Wed Sep 15 17:47:12 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