# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277374965 -3600
# Node ID 65b8e37066efe9a56af992fb52842a79f62b801a
# Parent  f7565e9c9ce804d143c554775e1cbfbd124e7e24# Parent  a003130def4e6c1ebc5202aa54d80cf7769f2fb0
Merge fix for bug 2620.

diff -r f7565e9c9ce8 -r 65b8e37066ef hwrmhaptics/hapticseffectdatagetterfw/plugins/hapticsivtgetterplugin/group/bld.inf
diff -r f7565e9c9ce8 -r 65b8e37066ef hwrmhaptics/hapticspacketizer/plugins/hapticsivtgetterplugin/group/bld.inf
diff -r f7565e9c9ce8 -r 65b8e37066ef hwrmhaptics/hapticspacketizer/plugins/hapticsvibepacketizerplugin/group/bld.inf
diff -r f7565e9c9ce8 -r 65b8e37066ef sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Fri Jun 11 14:56:08 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Jun 24 11:22:45 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