--- a/phoneapp/phoneuistates/bwins/phoneuistatesu.def	Tue Apr 27 16:37:10 2010 +0300
+++ b/phoneapp/phoneuistates/bwins/phoneuistatesu.def	Wed Apr 28 13:15:47 2010 +0100
@@ -1,6 +1,6 @@
 EXPORTS
-	?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 1 NONAME ; void CPhoneTwoSingles::ConstructL(void)
-	?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 2 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void)
+	?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 1 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void)
+	?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 2 NONAME ; void CPhoneTwoSingles::ConstructL(void)
 	?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 3 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int)
 	?HandleKeyMessageL@CPhoneAlerting@@MAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 4 NONAME ; void CPhoneAlerting::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
 	?HandleKeyMessageL@CPhoneTwoSingles@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 5 NONAME ; void CPhoneTwoSingles::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)

--- a/phoneapp/silenceactionplugin/group/bld.inf	Tue Apr 27 16:37:10 2010 +0300
+++ b/phoneapp/silenceactionplugin/group/bld.inf	Wed Apr 28 13:15:47 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