diff -r 36a7e6c28b62 -r d3fef5e65224 sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu May 06 14:58:25 2010 +0100
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu May 06 15:30:27 2010 +0100
@@ -24,8 +24,9 @@
 ./sspluginsgsa.iby			/epoc32/rom/include/sspluginsgsa.iby
 
 PRJ_MMPFILES
-./gsastatepolicystartup.mmp
-./gsastatepolicyshutdown.mmp
-./gsastatepolicynormal.mmp
-./gsastatepolicyfail.mmp
+// darios: ssm.state.policy.000n.dll conflicting with s60 version (see bug 2620)
+//./gsastatepolicystartup.mmp
+//./gsastatepolicyshutdown.mmp
+//./gsastatepolicynormal.mmp
+//./gsastatepolicyfail.mmp