Bug 398009 - fix mangled license headers. a=stuart.

2024-09-13 09:24:08 -07:00 · 2007-10-06 05:08:39 -07:00 · 2007-10-06 05:08:39 -07:00 · 2c4fa4403c
commit 2c4fa4403c
parent cb425932f6
103 changed files with 105 additions and 103 deletions
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@ -16,7 +16,7 @@
 # The Original Code is the Mozilla browser.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard.  Portions created by Christopher Blizzard Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/embedding/base/objs.mk
+++ b/embedding/base/objs.mk
@ -16,7 +16,7 @@
 # The Original Code is the Mozilla browser.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard.  Portions created by Christopher Blizzard Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/embedding/base/standalone/Makefile.in
+++ b/embedding/base/standalone/Makefile.in
@ -16,7 +16,7 @@
 # The Original Code is the Mozilla browser.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard.  Portions created by Christopher Blizzard Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/embedding/browser/activex/src/common/Makefile.in
+++ b/embedding/browser/activex/src/common/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is the Mozilla browser.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard.  Portions created by Christopher Blizzard Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/embedding/browser/gtk/src/EmbedContentListener.cpp
+++ b/embedding/browser/gtk/src/EmbedContentListener.cpp
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedContentListener.h
+++ b/embedding/browser/gtk/src/EmbedContentListener.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+++ b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
@ -17,7 +17,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Oleg Romashin. Portions created by Oleg Romashin are Copyright (C) Oleg Romashin.  All Rights Reserved.
+ * Oleg Romashin.
 * Portions created by the Initial Developer are Copyright (C) 2006
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedContextMenuInfo.h
+++ b/embedding/browser/gtk/src/EmbedContextMenuInfo.h
@ -19,7 +19,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Oleg Romashin. Portions created by Oleg Romashin are Copyright (C) Oleg Romashin.  All Rights Reserved.
+ * Oleg Romashin.
 * Portions created by the Initial Developer are Copyright (C) 2006
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedDownloadMgr.cpp
+++ b/embedding/browser/gtk/src/EmbedDownloadMgr.cpp
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedDownloadMgr.h
+++ b/embedding/browser/gtk/src/EmbedDownloadMgr.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedEventListener.cpp
+++ b/embedding/browser/gtk/src/EmbedEventListener.cpp
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedEventListener.h
+++ b/embedding/browser/gtk/src/EmbedEventListener.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedGtkTools.cpp
+++ b/embedding/browser/gtk/src/EmbedGtkTools.cpp
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Oleg Romashin. Portions created by Oleg Romashin are Copyright (C) Oleg Romashin.  All Rights Reserved.
+ * Oleg Romashin.
 * Portions created by the Initial Developer are Copyright (C) 2006
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedGtkTools.h
+++ b/embedding/browser/gtk/src/EmbedGtkTools.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Oleg Romashin. Portions created by Oleg Romashin are Copyright (C) Oleg Romashin.  All Rights Reserved.
+ * Oleg Romashin.
 * Portions created by the Initial Developer are Copyright (C) 2006
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedPrivate.cpp
+++ b/embedding/browser/gtk/src/EmbedPrivate.cpp
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedPrivate.h
+++ b/embedding/browser/gtk/src/EmbedPrivate.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedProgress.cpp
+++ b/embedding/browser/gtk/src/EmbedProgress.cpp
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedProgress.h
+++ b/embedding/browser/gtk/src/EmbedProgress.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedPrompter.h
+++ b/embedding/browser/gtk/src/EmbedPrompter.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedWindow.cpp
+++ b/embedding/browser/gtk/src/EmbedWindow.cpp
@ -17,7 +17,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedWindow.h
+++ b/embedding/browser/gtk/src/EmbedWindow.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedWindowCreator.cpp
+++ b/embedding/browser/gtk/src/EmbedWindowCreator.cpp
@ -17,7 +17,7 @@
 *
 * The Initial Developer of the Original Code is
 * Christopher Blizzard.
- * Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ *
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/EmbedWindowCreator.h
+++ b/embedding/browser/gtk/src/EmbedWindowCreator.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembed.h
+++ b/embedding/browser/gtk/src/gtkmozembed.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembed2.cpp
+++ b/embedding/browser/gtk/src/gtkmozembed2.cpp
@ -17,7 +17,7 @@
 *
 * The Initial Developer of the Original Code is
 * Christopher Blizzard.
- * Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ *
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembed_common.cpp
+++ b/embedding/browser/gtk/src/gtkmozembed_common.cpp
@ -17,7 +17,7 @@
 *
 * The Initial Developer of the Original Code is
 * Christopher Blizzard.
- * Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ *
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembed_common.h
+++ b/embedding/browser/gtk/src/gtkmozembed_common.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembed_download.cpp
+++ b/embedding/browser/gtk/src/gtkmozembed_download.cpp
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembed_download.h
+++ b/embedding/browser/gtk/src/gtkmozembed_download.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembed_internal.h
+++ b/embedding/browser/gtk/src/gtkmozembed_internal.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/src/gtkmozembedprivate.h
+++ b/embedding/browser/gtk/src/gtkmozembedprivate.h
@ -16,7 +16,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/tests/TestGtkEmbed.cpp
+++ b/embedding/browser/gtk/tests/TestGtkEmbed.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
+++ b/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
+++ b/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedContentListener.cpp
+++ b/embedding/browser/photon/src/EmbedContentListener.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedContentListener.h
+++ b/embedding/browser/photon/src/EmbedContentListener.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedEventListener.cpp
+++ b/embedding/browser/photon/src/EmbedEventListener.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedEventListener.h
+++ b/embedding/browser/photon/src/EmbedEventListener.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedPrintListener.cpp
+++ b/embedding/browser/photon/src/EmbedPrintListener.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedPrintListener.h
+++ b/embedding/browser/photon/src/EmbedPrintListener.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedPrivate.cpp
+++ b/embedding/browser/photon/src/EmbedPrivate.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedPrivate.h
+++ b/embedding/browser/photon/src/EmbedPrivate.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedProgress.cpp
+++ b/embedding/browser/photon/src/EmbedProgress.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedProgress.h
+++ b/embedding/browser/photon/src/EmbedProgress.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedStream.cpp
+++ b/embedding/browser/photon/src/EmbedStream.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedStream.h
+++ b/embedding/browser/photon/src/EmbedStream.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedWindow.cpp
+++ b/embedding/browser/photon/src/EmbedWindow.cpp
@ -17,7 +17,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedWindow.h
+++ b/embedding/browser/photon/src/EmbedWindow.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedWindowCreator.cpp
+++ b/embedding/browser/photon/src/EmbedWindowCreator.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/EmbedWindowCreator.h
+++ b/embedding/browser/photon/src/EmbedWindowCreator.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/PtMozilla.cpp
+++ b/embedding/browser/photon/src/PtMozilla.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/src/PtMozilla.h
+++ b/embedding/browser/photon/src/PtMozilla.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/photon/tests/TestPhEmbed.cpp
+++ b/embedding/browser/photon/tests/TestPhEmbed.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/webBrowser/nsEmbedStream.cpp
+++ b/embedding/browser/webBrowser/nsEmbedStream.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/browser/webBrowser/nsEmbedStream.h
+++ b/embedding/browser/webBrowser/nsEmbedStream.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/embedding/config/Makefile.in
+++ b/embedding/config/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is the Mozilla browser.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard.  Portions created by Christopher Blizzard Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/embedding/lite/Makefile.in
+++ b/embedding/lite/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is the Mozilla browser.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard.  Portions created by Christopher Blizzard Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/embedding/wrappers/DotNETEmbed/Makefile
+++ b/embedding/wrappers/DotNETEmbed/Makefile
@ -15,7 +15,7 @@
 # The Original Code is the Mozilla browser.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard.  Portions created by Christopher Blizzard Copyright (C) 1999, Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/extensions/python/xpcom/src/PyIClassInfo.cpp
+++ b/extensions/python/xpcom/src/PyIClassInfo.cpp
@ -14,7 +14,7 @@
 * The Original Code is the Python XPCOM language bindings.
 *
 * The Initial Developer of the Original Code is
- * ActiveState Tool Corp. Portions created by ActiveState Tool Corp. are Copyright (C)  2001 ActiveState Tool Corp.  All Rights Reserved.
+ * ActiveState Tool Corp.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/intl/ctl/public/Makefile.in
+++ b/intl/ctl/public/Makefile.in
@ -12,7 +12,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+# The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
 # Sun Microsystems, Inc.
--- a/intl/ctl/public/nsCtlCIID.h
+++ b/intl/ctl/public/nsCtlCIID.h
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/public/nsILE.h
+++ b/intl/ctl/public/nsILE.h
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code..
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/Makefile.in
+++ b/intl/ctl/src/Makefile.in
@ -12,7 +12,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+# The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
 # Sun Microsystems, Inc.
--- a/intl/ctl/src/hindiShaper/Makefile.in
+++ b/intl/ctl/src/hindiShaper/Makefile.in
@ -11,7 +11,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2002 SUN Microsystems, Inc. All Rights Reserved.
+# The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
 # Sun Microsystems, Inc.
--- a/intl/ctl/src/hindiShaper/dvng-x.c
+++ b/intl/ctl/src/hindiShaper/dvng-x.c
@ -15,7 +15,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2002 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/nsCtlLEModule.cpp
+++ b/intl/ctl/src/nsCtlLEModule.cpp
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/nsULE.cpp
+++ b/intl/ctl/src/nsULE.cpp
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/nsULE.h
+++ b/intl/ctl/src/nsULE.h
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/nsUnicodeToSunIndic.cpp
+++ b/intl/ctl/src/nsUnicodeToSunIndic.cpp
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/nsUnicodeToSunIndic.h
+++ b/intl/ctl/src/nsUnicodeToSunIndic.h
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/nsUnicodeToTIS620.cpp
+++ b/intl/ctl/src/nsUnicodeToTIS620.cpp
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/ctl/src/nsUnicodeToTIS620.h
+++ b/intl/ctl/src/nsUnicodeToTIS620.h
@ -14,7 +14,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
- * The Original Code is mozilla.org code. The Initial Developer of the Original Code is Sun Microsystems, Inc.  Portions created by SUN are Copyright (C) 2000 SUN Microsystems, Inc. All Rights Reserved.
+ * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
 * Sun Microsystems, Inc.
--- a/intl/unicharutil/util/gensymmtable.pl
+++ b/intl/unicharutil/util/gensymmtable.pl
@ -16,7 +16,7 @@
 # The Original Code is IBM code.
 #
 # The Initial Developer of the Original Code is
-# IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+# IBM.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@ -16,7 +16,8 @@
 * The Original Code is Novell code.
 *
 * The Initial Developer of the Original Code is Novell Corporation.
- * Portions created by Novell are Copyright (C) 2005 Novell. All Rights Reserved.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
 *     robert@ocallahan.org
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@ -16,7 +16,8 @@
 * The Original Code is Novell code.
 *
 * The Initial Developer of the Original Code is Novell Corporation.
- * Portions created by Novell are Copyright (C) 2005 Novell. All Rights Reserved.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
 *     robert@ocallahan.org
--- a/rdf/chrome/tools/chromereg/regchrome.cpp
+++ b/rdf/chrome/tools/chromereg/regchrome.cpp
@ -15,7 +15,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/toolkit/components/remote/nsIRemoteService.idl
+++ b/toolkit/components/remote/nsIRemoteService.idl
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard <blizzard@mozilla.org>.  Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard <blizzard@mozilla.org>.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/toolkit/components/viewsource/content/viewSource.js
+++ b/toolkit/components/viewsource/content/viewSource.js
@ -15,7 +15,7 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.  Portions created by Netscape are Copyright (C) Netscape Communications Corporation.  All Rights Reserved.
+# Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/toolkit/content/widgets/spinbuttons.xml
+++ b/toolkit/content/widgets/spinbuttons.xml
@ -16,7 +16,7 @@
   - The Original Code is Mozilla.org code.
   -
   - The Initial Developer of the Original Code is
-   - Håkan Waara. Portions created by Håkan Waara are Copyright (C), Håkan Waara.  All Rights Reserved.
+   - Håkan Waara.
   - Portions created by the Initial Developer are Copyright (C) 2001
   - the Initial Developer. All Rights Reserved.
   -
--- a/toolkit/themes/pinstripe/global/spinbuttons.css
+++ b/toolkit/themes/pinstripe/global/spinbuttons.css
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Håkan Waara Portions created by Håkan Waara are Copyright (C) Håkan Waara.  All Rights Reserved.
+ * Håkan Waara
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/tools/elf-dynstr-gc/Makefile.in
+++ b/tools/elf-dynstr-gc/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is Mozilla Source Code.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/tools/jprof/jprofsig
+++ b/tools/jprof/jprofsig
@ -16,7 +16,7 @@
 # The Original Code is Mozilla Communicator.
 #
 # The Initial Developer of the Original Code is
-# Chris McAfee. Portions created by Chris McAfee are Copyright (C) The Mozilla Organization. All Rights Reserved.
+# Chris McAfee.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/widget/public/nsIBidiKeyboard.idl
+++ b/widget/public/nsIBidiKeyboard.idl
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/beos/nsBidiKeyboard.cpp
+++ b/widget/src/beos/nsBidiKeyboard.cpp
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/beos/nsBidiKeyboard.h
+++ b/widget/src/beos/nsBidiKeyboard.h
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/cocoa/nsBidiKeyboard.h
+++ b/widget/src/cocoa/nsBidiKeyboard.h
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/cocoa/nsBidiKeyboard.mm
+++ b/widget/src/cocoa/nsBidiKeyboard.mm
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/widget/src/gtk2/nsGtkCursors.h
+++ b/widget/src/gtk2/nsGtkCursors.h
@ -17,7 +17,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Tim Copperfield. Portions created by Tim Copperfield are Copyright (C) Tim Copperfield. All Rights Reserved.
+ * Tim Copperfield.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/os2/nsBidiKeyboard.cpp
+++ b/widget/src/os2/nsBidiKeyboard.cpp
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/os2/nsBidiKeyboard.h
+++ b/widget/src/os2/nsBidiKeyboard.h
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/photon/nsBidiKeyboard.h
+++ b/widget/src/photon/nsBidiKeyboard.h
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/photon/nsPhMozRemoteHelper.h
+++ b/widget/src/photon/nsPhMozRemoteHelper.h
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/windows/nsBidiKeyboard.cpp
+++ b/widget/src/windows/nsBidiKeyboard.cpp
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/windows/nsBidiKeyboard.h
+++ b/widget/src/windows/nsBidiKeyboard.h
@ -16,7 +16,7 @@
 * The Original Code is IBM code.
 *
 * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * IBM.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/widget/src/xremoteclient/Makefile.in
+++ b/widget/src/xremoteclient/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/xpfe/components/xremote/Makefile.in
+++ b/xpfe/components/xremote/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard <blizzard@mozilla.org>.  Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard <blizzard@mozilla.org>.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/xpfe/components/xremote/public/Makefile.in
+++ b/xpfe/components/xremote/public/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard <blizzard@mozilla.org>.  Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard <blizzard@mozilla.org>.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/xpfe/components/xremote/src/Makefile.in
+++ b/xpfe/components/xremote/src/Makefile.in
@ -15,7 +15,7 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
-# Christopher Blizzard <blizzard@mozilla.org>.  Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+# Christopher Blizzard <blizzard@mozilla.org>.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
--- a/xpfe/components/xremote/src/XRemoteContentListener.cpp
+++ b/xpfe/components/xremote/src/XRemoteContentListener.cpp
@ -14,7 +14,7 @@
 * The Original Code is mozilla.org code.
 *
 * The Initial Developer of the Original Code is
- * Christopher Blizzard <blizzard@mozilla.org>.  Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard.  All Rights Reserved.
+ * Christopher Blizzard <blizzard@mozilla.org>.
 * Portions created by the Initial Developer are Copyright (C) 2001
 * the Initial Developer. All Rights Reserved.
 *
--- a/Show More
+++ b/Show More