# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1284740513 -3600
# Node ID 6ff7ee498df17aa090614f1f92c481dea8345109
# Parent  c26be94c888973464bf08a71aea8c11b761b5cfc# Parent  c50786bbedec5fef59c7f530878018acc96a8928
Merge re-apply fix for Bug 2620

diff -r c26be94c8889 -r 6ff7ee498df1 sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue Sep 14 23:45:36 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Fri Sep 17 17:21:53 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