# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277309875 -3600
# Node ID a822ce7b20026b9372299e0b0b858837ae4dcada
# Parent  ba76fc04e6c263557fce0cf79c8f016c2da7b7d3# Parent  7dfa256dda63cbd98acd7dc40c37707804919eb1
Merge heads and fix for bug 2360.

diff -r ba76fc04e6c2 -r a822ce7b2002 phoneapp/silenceactionplugin/group/bld.inf
--- a/phoneapp/silenceactionplugin/group/bld.inf	Fri Jun 04 10:19:18 2010 +0100
+++ b/phoneapp/silenceactionplugin/group/bld.inf	Wed Jun 23 17:17:55 2010 +0100
@@ -10,6 +10,7 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
+* NTT DOCOMO, INC - BUG 2360
 *
 * Description: Build file for silence action plugin.
 *
@@ -23,11 +24,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-../data/silence.rul\
-    /epoc32/release/winscw/udeb/z/private/10282bc4/rules/silence.rul
-
-../data/silence.rul\
-    /epoc32/data/z/private/10282bc4/rules/silence.rul
+../data/silence.rul z:/private/10282BC4/Rules/silence.rul
 
 ../data/silenceactionplugin_stub.sis\
     /epoc32/data/z/system/install/silenceactionplugin_stub.sis
diff -r ba76fc04e6c2 -r a822ce7b2002 phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_1.docml
diff -r ba76fc04e6c2 -r a822ce7b2002 phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_2.docml
diff -r ba76fc04e6c2 -r a822ce7b2002 phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_3.docml
diff -r ba76fc04e6c2 -r a822ce7b2002 phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_4.docml