--- a/brandingserver/bsserver/cbsinstallhandler.cpp	Fri Mar 12 15:43:59 2010 +0200
+++ b/brandingserver/bsserver/cbsinstallhandler.cpp	Mon Mar 15 12:41:57 2010 +0200
@@ -343,7 +343,7 @@
     // aaa$bbb -> aaa$bbb.install
     CDir* dir = NULL;
     iFs.GetDir( file, KEntryAttNormal, ESortNone, dir );
-    if( dir->Count() > 0 )
+    if( dir && dir->Count() > 0 )
         {
         // brand is installed
         delete dir;
@@ -362,7 +362,7 @@
     // check file with different versions:
     // aaa$bbb -> aaa$bbb$*.install
     iFs.GetDir( file, KEntryAttNormal, ESortNone, dir );
-    if( dir->Count() > 0 )
+    if( dir && dir->Count() > 0 )
         {
         // brand is installed
         delete dir;

--- a/brandingserver/group/backup_registration.xml	Fri Mar 12 15:43:59 2010 +0200
+++ b/brandingserver/group/backup_registration.xml	Mon Mar 15 12:41:57 2010 +0200
@@ -3,7 +3,7 @@
 <!-- Backup registration file for Branding Server -->
 
 <backup_registration version="1.0">
-	<passive_backup delete_before_restore="yes">
+	<passive_backup delete_before_restore="no">
 		<include_directory name="\"/>		
 	</passive_backup>
 	<proxy_data_manager SID="0x10202BE9"/>

--- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt	Fri Mar 12 15:43:59 2010 +0200
+++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt	Mon Mar 15 12:41:57 2010 +0200
@@ -1,8 +1,7 @@
-#
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
@@ -11,7 +10,8 @@
 #
 # Contributors:
 # 
-# Description:
+# Description: MMP file for STIF Test Framework's TestScripter 
+# testclass test module.
 #
 #