# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1277734852 -3600
# Node ID 99e0f09d12c30cf7a269426e82ec652df9a787fb
# Parent  cc88aabd867b5229d63d9b98d4cfc91904ec4618# Parent  23c4ec5a1df9114b6d284a4cb0f38f827ebef235
Merge

diff -r 23c4ec5a1df9 -r 99e0f09d12c3 kerneltest/e32utils/group/base_e32utils.mrp
--- a/kerneltest/e32utils/group/base_e32utils.mrp	Fri May 28 17:11:06 2010 +0100
+++ b/kerneltest/e32utils/group/base_e32utils.mrp	Mon Jun 28 15:20:52 2010 +0100
@@ -16,8 +16,6 @@
 source	\sf\os\kernelhwsrv\kerneltest\e32utils\testusbcldd
 source	\sf\os\kernelhwsrv\kerneltest\e32utils\trace
 source	\sf\os\kernelhwsrv\kerneltest\e32utils\usbmsapp
-source	\sf\os\kernelhwsrv\kerneltest\e32utils\sdpartition	
-source	\sf\os\kernelhwsrv\kerneltest\e32utils\nandboot\coreldr\bootstrap_smrif.h
 	
 #MattD: Reltools 2.67 don't understand 'cwtools' are the CW equivelent of 'tools' and try to do '-what cwtools udeb' instead of '-what cwtools deb'.
 #binary	\sf\os\kernelhwsrv\kerneltest\e32utils\group cwtools
@@ -27,7 +25,6 @@
 binary	\epoc32\release\tools\rel\analyse.exe
 binary	\epoc32\release\tools\rel\netcards.exe
 
--export_file	\sf\os\kernelhwsrv\kerneltest\e32utils\analyse\profiler.rtf	\epoc32\engdoc\profiler\Profiler.rtf
 notes_source	\component_defs\release.src
 
 
diff -r 23c4ec5a1df9 -r 99e0f09d12c3 kerneltest/e32utils/group/bld.inf
--- a/kerneltest/e32utils/group/bld.inf	Fri May 28 17:11:06 2010 +0100
+++ b/kerneltest/e32utils/group/bld.inf	Mon Jun 28 15:20:52 2010 +0100
@@ -30,8 +30,6 @@
 
 PRJ_EXPORTS
 
-../nandboot/coreldr/bootstrap_smrif.h 		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bootstrap_smrif.h)
-
 ../profiler/profiler.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(profiler.h)
 
 ../d_exc/printstk.pl 						/epoc32/rom/tools/printstk.pl