--- a/bintools/elftools/elftran/elf_reloc.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/bintools/elftools/elftran/elf_reloc.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -128,7 +128,7 @@
 		checkreloc(aElfFile, *data, codeRelocs[i]->r_offset);
 		//*data=FixAddress(aElfFile, *data, codeRelocs[i]);
 		}
-// fix defect
+
 	for (TInt j=0; j<numberOfDataRelocs; j++)
 	        {
 		data=aElfFile.DataPtrFromAddr(dataRelocs[j]->r_offset);

--- a/bintools/rcomp/src/messages.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/bintools/rcomp/src/messages.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -252,8 +252,8 @@
 	Add(new Message(LT_044_Message, LT_044, "044", true, KWarning));
 
 	/* This warning has been added to hopefully fix a long standing defect where labels which 
-	 * have not been declared are silently included in the emitted resource file. More 
-	 * details at defect INC061459 */
+	 * have not been declared are silently included in the emitted resource file.  
+	 */
 	const String LT_045_Message = "the following label is used but has not been declared: ";
 	Add(new Message(LT_045_Message, LT_045, "045", true, KWarning));
 

--- a/bintools/rcomp/src/rcompl.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/bintools/rcomp/src/rcompl.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -236,7 +236,7 @@
 static int yy_start = 0;	/* start state number */
 
 /* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
+ * instead of setting up a fresh yyin.  
  */
 static int yy_did_buffer_switch_on_eof;
 

--- a/deprecated/etouch/etouch.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/deprecated/etouch/etouch.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -21,7 +21,7 @@
 #endif //__MSVCDOTNET__
 
 #if defined(__VC32__) || defined(__TOOLS2__)
- #include <sys\utime.h>
+ #include <sys/utime.h>
 #else
  #include <utime.h>
 #endif

--- a/e32tools/elf2e32/source/e32imagefile.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/e32tools/elf2e32/source/e32imagefile.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -495,7 +495,7 @@
 		aRelocsSize = Align(rsize + sizeof(E32RelocSection), sizeof(uint32));
 
 		uint32 aBase = (*aRelocList.begin())->iSegment->p_vaddr;
-		//add for cleanup to be done later..
+		
 		cleanupStack.push_back(aRelocs);
 		aRelocs =	new char [aRelocsSize];
 		memset(aRelocs, 0, aRelocsSize);

--- a/imgtools/romtools/readimage/src/image_handler.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/imgtools/romtools/readimage/src/image_handler.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -290,7 +290,6 @@
  * @fn ImageHandler::ReadBareImage
  * @brief this function processes image type under the condition of that if an image is given without header which means the image is not self-described
  * @return type of the image.
- * @note this function is introduced for handling issues raised by DEF129908
  */
 EImageType ImageHandler::ReadBareImage(ifstream& aIfs) {
     TRomHeader romHdr ; 

--- a/imgtools/romtools/rofsbuild/fsnode.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/imgtools/romtools/rofsbuild/fsnode.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -287,8 +287,7 @@
 		TShortDirEntry* entry = reinterpret_cast<TShortDirEntry*>(aClusterData);
 		if(iParent != NULL) {
 			//Make 
-			GetShortEntry(entry); 
-			//TODO: Add comments to avoid mistaken deleting.			
+			GetShortEntry(entry); 			
 			memcpy(entry->DIR_Name,".            ",sizeof(entry->DIR_Name));
 			entry ++ ;
 			iParent->GetShortEntry(entry);

--- a/imgtools/romtools/rofsbuild/r_obey.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/imgtools/romtools/rofsbuild/r_obey.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -46,7 +46,7 @@
 #include <unistd.h>
 #else
 #include <io.h> 
-#include <direct.h> //TODO: check under MinGW4 + stlport 5.2
+#include <direct.h> 
 #include <conio.h> 
 #endif
 

--- a/imgtools/romtools/rombuild/r_global.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/imgtools/romtools/rombuild/r_global.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -44,7 +44,7 @@
 SCapabilitySet gPlatSecDisabledCaps={{0}}; 
 SCapabilitySet gPlatSecAllCaps={{0}};
 SDemandPagingConfig gDemandPagingConfig={0,0,0,{0}}; 
-TBool gGenInc=EFalse;	// Default to no generate INC file.  DEF095619
+TBool gGenInc=EFalse;	// Default to no generate INC file.  
 TInt gLogLevel=0;  // Information is logged based on logging level.
 					// The default is 0. So all the existing logs are generated as if gLogLevel == 0.
 					// If any extra information is required, the log level must be appropriately supplied.

--- a/imgtools/romtools/rombuild/r_global.h	Tue Nov 02 16:54:53 2010 +0800
+++ b/imgtools/romtools/rombuild/r_global.h	Tue Nov 09 17:18:57 2010 +0800
@@ -80,7 +80,7 @@
 extern SCapabilitySet gPlatSecDisabledCaps;
 extern SCapabilitySet gPlatSecAllCaps;
 extern SDemandPagingConfig gDemandPagingConfig;
-extern TBool gGenInc;						// DEF095619
+extern TBool gGenInc;						
 extern TBool gEnableStdPathWarning;
 extern TInt gLogLevel;
 extern TBool gLowMem;

--- a/imgtools/romtools/rombuild/rombuild.cpp	Tue Nov 02 16:54:53 2010 +0800
+++ b/imgtools/romtools/rombuild/rombuild.cpp	Tue Nov 09 17:18:57 2010 +0800
@@ -75,7 +75,7 @@
 	"        -compressionmethod <method>   method one of none|inflate|bytepair to set the compression\n"
 	"        -no-sorted-romfs              do not add sorted entries arrays (6.1 compatible)\n"
 	"        -oby-charset=<charset> used character set in which OBY was written\n"
-	"        -geninc                       to generate include file for licensee tools to use\n"			// DEF095619
+	"        -geninc                       to generate include file for licensee tools to use\n"			
 	"        -loglevel<level>              level of information to log (valid levels are 0,1,2,3,4).\n" //Tools like Visual ROM builder need the host/ROM filenames, size & if the file is hidden.
 	"        -wstdpath                     warn if destination path provided for a file is not a standard path\n"
 	"        -argfile=<fileName>           specify argument-file name containing list of command-line arguments to rombuild\n"
@@ -296,7 +296,7 @@
 				}
 			else if (stricmp(arg, "no-sorted-romfs")==0)
 				gSortedRomFs=EFalse;
-			else if (stricmp(arg, "geninc")==0)				// DEF095619
+			else if (stricmp(arg, "geninc")==0)				
 				gGenInc=ETrue;
  			else if (stricmp(arg, "wstdpath")==0)			// Warn if destination path provided for a file		
  				gEnableStdPathWarning=ETrue;					// is not a standard path as per platsec

--- a/sbsv1/buildsystem/extension/syslibs/test/charconv_testpostbuild.mk	Tue Nov 02 16:54:53 2010 +0800
+++ b/sbsv1/buildsystem/extension/syslibs/test/charconv_testpostbuild.mk	Tue Nov 09 17:18:57 2010 +0800
@@ -11,10 +11,7 @@
 # Contributors:
 #
 # Description:
-# This postbuild script is only called when a Test Build is done.  It deletes the KDDI/AU versions of the shiftjis and j5 plugin RSC file, so
-# that only the Docomo versions remain.  This removed ambiguity over which one will load during tests - a seperate version of the KDDI/AU
-# plugins is created for test build, with a unique UID number so they may coexist for test purposes.
-# 
+# This postbuild script is only called when a Test Build is done.  
 #
 
 TMPROOT:=$(subst \,/,$(EPOCROOT))