--- a/jdk/make/common/shared/Platform.gmk	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/common/shared/Platform.gmk	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/common/shared/Sanity.gmk	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/common/shared/Sanity.gmk	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/awt/FILES_c_windows.gmk	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/awt/FILES_c_windows.gmk	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/awt/FILES_export_unix.gmk	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/awt/FILES_export_unix.gmk	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2000-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/awt/FILES_export_windows.gmk	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/awt/FILES_export_windows.gmk	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2000-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/awt/Makefile	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/awt/Makefile	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1995-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/awt/mapfile-mawt-vers	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/awt/mapfile-mawt-vers	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/awt/mapfile-vers	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/awt/mapfile-vers	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/awt/mapfile-vers-linux	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/awt/mapfile-vers-linux	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2002-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/font/FILES_c.gmk	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/font/FILES_c.gmk	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/font/Makefile	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/font/Makefile	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/headless/mapfile-vers	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/headless/mapfile-vers	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/make/sun/xawt/mapfile-vers	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/make/sun/xawt/mapfile-vers	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2002-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+# Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/java/awt/GraphicsDevice.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/java/awt/GraphicsDevice.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/java/awt/Robot.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/java/awt/Robot.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/java/awt/image/DataBuffer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/java/awt/image/DataBuffer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/java/awt/peer/ComponentPeer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/java/awt/peer/ComponentPeer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/awt/NullComponentPeer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/awt/NullComponentPeer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/awt/image/SunWritableRaster.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/awt/image/SunWritableRaster.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/awt/image/VolatileSurfaceManager.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/awt/image/VolatileSurfaceManager.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/font/StrikeCache.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/font/StrikeCache.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/SurfaceData.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/SurfaceData.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/loops/BlitBg.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/loops/BlitBg.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/loops/GeneralRenderer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/opengl/OGLContext.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLContext.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/classes/sun/java2d/pipe/DrawImage.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/classes/sun/java2d/pipe/DrawImage.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/font/AccelGlyphCache.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/font/AccelGlyphCache.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/font/AccelGlyphCache.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/font/AccelGlyphCache.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/Trace.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/Trace.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/loops/BlitBg.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/loops/BlitBg.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLContext.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLContext.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLRenderer.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLRenderer.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/classes/sun/awt/motif/MComponentPeer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/classes/sun/java2d/x11/X11PMBlitBgLoops.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/classes/sun/java2d/x11/X11PMBlitBgLoops.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/java2d/windows/GDIBlitLoops.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/java2d/windows/GDIBlitLoops.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2003-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/Devices.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/Devices.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/awt_Component.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Component.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/awt_DrawingSurface.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_DrawingSurface.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

--- a/jdk/src/windows/native/sun/windows/awtmsg.h	Fri Jul 18 10:48:44 2008 -0700
+++ b/jdk/src/windows/native/sun/windows/awtmsg.h	Tue Jul 22 11:24:32 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2008 Sun Microsystems Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it