--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Wed Oct 13 15:58:37 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Fri Oct 22 17:27:12 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
 

--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmddevicesecuritycheck.cpp	Wed Oct 13 15:58:37 2010 +0300
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/cmddevicesecuritycheck.cpp	Fri Oct 22 17:27:12 2010 +0100
@@ -219,7 +219,8 @@
         }
     else
         {
-        CompleteClientRequest(iStatus.Int());
+            DEBUGPRINT2A("iStatus.Int is %d", iStatus.Int());
+            CompleteClientRequest(KErrNone/*iStatus.Int()*/);
         }
     }