# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277386202 -3600
# Node ID 05c4136f4a79d3b3d38fff2aa2bc7894065a10c2
# Parent  e96dd2dcf774e3c3c3e0658fe6d5038a310a3341# Parent  bea8e7dfa800490e815b886d522881d5fb42c093
Merge fix for bug 2169.

diff -r e96dd2dcf774 -r 05c4136f4a79 usbclasses/msmmplugin/group/bld.inf
diff -r e96dd2dcf774 -r 05c4136f4a79 usbclasses/usbhidclassdriver/group/bld.inf
diff -r e96dd2dcf774 -r 05c4136f4a79 usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h
--- a/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h	Tue May 18 13:19:18 2010 +0100
+++ b/usbclasses/usbphoneasmodem/classimplementation/atplugin/inc/pamengine.h	Thu Jun 24 14:30:02 2010 +0100
@@ -50,8 +50,8 @@
 	* @param aOwner
 	* @return Instance of CPamEngine
 	*/
-	static CPamEngine* CPamEngine::NewL( CPamPlugin* aOwner );
-						   
+	static CPamEngine* NewL( CPamPlugin* aOwner );
+
 	/**
 	* Two-phased contructor
 	* @param aOwner
diff -r e96dd2dcf774 -r 05c4136f4a79 usbengines/usbdevcon/inc/cusbdevcon.h
diff -r e96dd2dcf774 -r 05c4136f4a79 usbengines/usbdevcon/src/cusbdevcon.cpp
diff -r e96dd2dcf774 -r 05c4136f4a79 usbengines/usbwatcher/inc/debug.h
--- a/usbengines/usbwatcher/inc/debug.h	Tue May 18 13:19:18 2010 +0100
+++ b/usbengines/usbwatcher/inc/debug.h	Thu Jun 24 14:30:02 2010 +0100
@@ -109,13 +109,13 @@
 #define LOG( str ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] %s",\
         TUint(RThread().Id()), str  ); }
 
-#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s ,\
+#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s ,\
         TUint(RThread().Id()), v ); }
 
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s , \
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s , \
         TUint(RThread().Id()), v1, v2 ); }
 
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s, \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s, \
         TUint(RThread().Id()), v1, v2, v3); }
 
 class TFuncLogger
diff -r e96dd2dcf774 -r 05c4136f4a79 usbuis/rndisui/group/bld.inf