diff --git a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp
index f6f1e039828..e6183c4404d 100644
--- a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp
+++ b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp
@@ -61,8 +61,8 @@
 
 #include "prlog.h"
 #ifdef PR_LOGGING 
-extern PRLogModuleInfo * kPrintingLogMod;
-#define PR_PL(_p1)  PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
+extern PRLogModuleInfo * kGfxPrintingLogMod;
+#define PR_PL(_p1)  PR_LOG(kGfxPrintingLogMod, PR_LOG_DEBUG, _p1)
 #else
 #define PR_PL(_p1)
 #endif
diff --git a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp
index 7f437070ea0..e71cb511913 100644
--- a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp
+++ b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp
@@ -60,8 +60,8 @@ static char* nav4rounding = "font.size.nav4rounding";
 
 #include "prlog.h"
 #ifdef PR_LOGGING 
-PRLogModuleInfo * kPrintingLogMod = PR_NewLogModule("printing");
-#define PR_PL(_p1)  PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
+PRLogModuleInfo * kGfxPrintingLogMod = PR_NewLogModule("printing-gfx");
+#define PR_PL(_p1)  PR_LOG(kGfxPrintingLogMod, PR_LOG_DEBUG, _p1)
 #else
 #define PR_PL(_p1)
 #endif
diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp
index 5bb46961de3..312ba1fee4f 100644
--- a/mozilla/layout/generic/nsPageFrame.cpp
+++ b/mozilla/layout/generic/nsPageFrame.cpp
@@ -87,8 +87,8 @@ static NS_DEFINE_CID(kCChildCID, NS_CHILD_CID);
 
 #include "prlog.h"
 #ifdef PR_LOGGING 
-extern PRLogModuleInfo * kPrintingLogMod;
-#define PR_PL(_p1)  PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
+extern PRLogModuleInfo * kLayoutPrintingLogMod;
+#define PR_PL(_p1)  PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
 #else
 #define PR_PL(_p1)
 #endif
diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp
index fe29fde7f60..a504fe5ec6f 100644
--- a/mozilla/layout/generic/nsSimplePageSequence.cpp
+++ b/mozilla/layout/generic/nsSimplePageSequence.cpp
@@ -87,8 +87,8 @@ static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
 
 #include "prlog.h"
 #ifdef PR_LOGGING 
-PRLogModuleInfo * kPrintingLogMod = PR_NewLogModule("printing");
-#define PR_PL(_p1)  PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
+PRLogModuleInfo * kLayoutPrintingLogMod = PR_NewLogModule("printing-layout");
+#define PR_PL(_p1)  PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
 #else
 #define PR_PL(_p1)
 #endif
diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp
index 5bb46961de3..312ba1fee4f 100644
--- a/mozilla/layout/html/base/src/nsPageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsPageFrame.cpp
@@ -87,8 +87,8 @@ static NS_DEFINE_CID(kCChildCID, NS_CHILD_CID);
 
 #include "prlog.h"
 #ifdef PR_LOGGING 
-extern PRLogModuleInfo * kPrintingLogMod;
-#define PR_PL(_p1)  PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
+extern PRLogModuleInfo * kLayoutPrintingLogMod;
+#define PR_PL(_p1)  PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
 #else
 #define PR_PL(_p1)
 #endif
diff --git a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
index fe29fde7f60..a504fe5ec6f 100644
--- a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
+++ b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
@@ -87,8 +87,8 @@ static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
 
 #include "prlog.h"
 #ifdef PR_LOGGING 
-PRLogModuleInfo * kPrintingLogMod = PR_NewLogModule("printing");
-#define PR_PL(_p1)  PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
+PRLogModuleInfo * kLayoutPrintingLogMod = PR_NewLogModule("printing-layout");
+#define PR_PL(_p1)  PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
 #else
 #define PR_PL(_p1)
 #endif
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index e0cf2dce7ff..45b30947a92 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -349,7 +349,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType, nsIPrompt *prompt)
 ////////////////////////////////////////////////////////////////////////
 // flat file reg funcs
 static
-PRBool ReadSectionHeader(nsManifestLineReader& reader, const char *token)
+PRBool ReadSectionHeader(nsPluginManifestLineReader& reader, const char *token)
 {
   do {
     if (*reader.LinePtr() == '[') {
@@ -5397,7 +5397,7 @@ nsPluginHostImpl::ReadPluginInfo()
     return NS_OK; // ERROR CONDITION
   }
 
-  nsManifestLineReader reader;
+  nsPluginManifestLineReader reader;
   char* registry = reader.Init(flen);
   if (!registry) {
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/modules/plugin/base/src/nsPluginManifestLineReader.h b/mozilla/modules/plugin/base/src/nsPluginManifestLineReader.h
index 4490f4b3e55..8d3f65926ec 100644
--- a/mozilla/modules/plugin/base/src/nsPluginManifestLineReader.h
+++ b/mozilla/modules/plugin/base/src/nsPluginManifestLineReader.h
@@ -54,11 +54,11 @@
 
 #define PLUGIN_REGISTRY_END_OF_LINE_MARKER '$'
 
-class nsManifestLineReader
+class nsPluginManifestLineReader
 {
 public:
-    nsManifestLineReader() {mBase = mCur = mNext = mLimit = 0;} 
-    ~nsManifestLineReader() {delete [] mBase;}
+    nsPluginManifestLineReader() {mBase = mCur = mNext = mLimit = 0;} 
+    ~nsPluginManifestLineReader() { if (mBase) delete[] mBase; mBase=0;}
 
     char* Init(PRUint32 flen) 
     {