--- a/brandingserver/bsserver/cbsserver.cpp	Tue Aug 31 15:31:29 2010 +0300
+++ b/brandingserver/bsserver/cbsserver.cpp	Wed Sep 01 12:27:45 2010 +0100
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 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,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:  cbsserver.cpp
+* Description: cbsserver.cpp
 *
 */
 
 
-
 //  INCLUDE FILES
 
 #define __INCLUDE_CAPABILITY_NAMES__
@@ -25,7 +24,7 @@
 #include "cbsserver.h"
 #include "cbssession.h"
 #include "bsserverdefs.h"
-#include "DebugTrace.h"
+#include "debugtrace.h"
 #include "cbsstoragemanager.h"
 #include "cbsinstallhandler.h"
 #include "cbsbackupobserver.h"