# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275052708 -3600
# Node ID 51d936fe0d0c5abeb0002d440fcf6cb87aaa8d56
# Parent  4e1aa6a622a05c8b82896ab917aad381cef59455
Re-merge workaround for bug 2620

diff -r 4e1aa6a622a0 -r 51d936fe0d0c sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue Feb 02 00:53:00 2010 +0200
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Fri May 28 14:18:28 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