Merge RCL_3 fixes with latest delivery.
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf Thu Aug 19 11:09:10 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf Mon Aug 23 11:56:50 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