# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277374930 -3600
# Node ID a003130def4e6c1ebc5202aa54d80cf7769f2fb0
# Parent  d11478a8d5cf578164bdb19e14cdf347fc76fa73# Parent  51d936fe0d0c5abeb0002d440fcf6cb87aaa8d56
Merge workaround for bug 2630.

diff -r d11478a8d5cf -r a003130def4e sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Wed Jun 02 13:09:11 2010 +0100
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Jun 24 11:22:10 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