Index: /source/ariba/utility/system/StartupWrapper.cpp
===================================================================
--- /source/ariba/utility/system/StartupWrapper.cpp	(revision 5973)
+++ /source/ariba/utility/system/StartupWrapper.cpp	(revision 5978)
@@ -96,5 +96,5 @@
 	log4cxx::BasicConfigurator::configure();
 
-	// set the global log level
+	// set the global log level to warning
 	{
 		log4cxx::LoggerPtr logger(log4cxx::Logger::getRootLogger());
@@ -103,42 +103,10 @@
 
 	// set up again an individual level if you like
-	
+#ifndef HAVE_MAEMO
 	{
 		log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("MCPO"));
 		logger->setLevel(log4cxx::Level::getDebug());
-	}/*
-	{
-		log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseCommunication"));
-		logger->setLevel(log4cxx::Level::getDebug());
 	}
-	{
-		log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("OverlayBootstrap"));
-		logger->setLevel(log4cxx::Level::getDebug());
-	}
-	{
-		log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BootstrapManager"));
-		logger->setLevel(log4cxx::Level::getDebug());
-	}
-	{
-		log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BluetoothSdp"));
-		logger->setLevel(log4cxx::Level::getDebug());
-	}
-	{
-			log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("Chord"));
-			logger->setLevel(log4cxx::Level::getInfo());
-	}
-	{
-			log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseOverlay"));
-			logger->setLevel(log4cxx::Level::getInfo());
-	}
-*/
-	//$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-	// DON'T SVN COMMIT YOUR CHANGED LOGGING! THE ABOVE CODE MUST REMAIN AS IS!
-	//$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-
-#ifdef HAVE_MAEMO
-	log4cxx::LoggerPtr logger(log4cxx::Logger::getRootLogger());
-	logger->setLevel(log4cxx::Level::getWarn());
-#endif
+#endif //HAVE_MAEMO
 }