Index: source/ariba/utility/logging/Logging.h
===================================================================
--- source/ariba/utility/logging/Logging.h	(revision 4987)
+++ source/ariba/utility/logging/Logging.h	(revision 5151)
@@ -69,10 +69,23 @@
 	log4cxx::LoggerPtr x::logger(log4cxx::Logger::getLogger(#x));
 
-#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
-#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
-#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
-#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
-#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
-#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+#ifdef HAVE_MAEMO
+
+  #define logging_trace(x)  { }
+  #define logging_debug(x)  { }
+  #define logging_info(x)   { }
+  #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+  #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+
+#else
+
+  #define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
+  #define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
+  #define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
+  #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+  #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+
+#endif // HAVE_MAEMO
 
 #endif //LOGGING_H__
Index: source/ariba/utility/system/StartupWrapper.cpp
===================================================================
--- source/ariba/utility/system/StartupWrapper.cpp	(revision 4987)
+++ source/ariba/utility/system/StartupWrapper.cpp	(revision 5151)
@@ -103,5 +103,5 @@
 	// set up again an individual level if you like
 	{
-//		log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseOverlay"));
+//		log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("PingPong"));
 //		logger->setLevel(log4cxx::Level::getDebug());
 	}
