# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1274198224 -3600
# Node ID 8b6c1c3d207b33f342a16021278e00fc712d9ac1
# Parent  66ecddbca91413c1cb442b45b1f08c864241fade# Parent  d80caf2a66055891702ad7b09c63c3466e8e50da
Merge fix for bug 2631 (included in recent delivery) and workaround for bug 2620.

diff -r 66ecddbca914 -r 8b6c1c3d207b hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf
--- a/hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf	Tue May 11 17:23:24 2010 +0300
+++ b/hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf	Tue May 18 16:57:04 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -15,13 +15,10 @@
 *
 */
 
-#include <platform_paths.hrh>
-
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
 
-
 PRJ_MMPFILES
 hwrmhapticseffectdatagetterfw.mmp
diff -r 66ecddbca914 -r 8b6c1c3d207b hwrmhaptics/hapticspacketizer/group/bld.inf
--- a/hwrmhaptics/hapticspacketizer/group/bld.inf	Tue May 11 17:23:24 2010 +0300
+++ b/hwrmhaptics/hapticspacketizer/group/bld.inf	Tue May 18 16:57:04 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,7 +20,6 @@
 
 PRJ_EXPORTS
 
-
 PRJ_MMPFILES
 hwrmhapticspacketizer.mmp
 
diff -r 66ecddbca914 -r 8b6c1c3d207b sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue May 11 17:23:24 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue May 18 16:57:04 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