# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1279030651 -3600
# Node ID a616a19c9ce0d60fb76f46f50dba8d1cfc1961bd
# Parent  0b0048910c20ce5bb909eef4473feb4ef40bba7b# Parent  5ced40f3c181862f046f038fff3da4fd93841a78
Re-merge workaround for bug 2620.

diff -r 0b0048910c20 -r a616a19c9ce0 sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Mon Jun 21 17:06:14 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue Jul 13 15:17:31 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