Integrated OpenJDK 6 b21.

1 files changed, 4 insertions, 5 deletions

diff --git a/openjdk/AssemblyInfo.java.in b/openjdk/AssemblyInfo.java.in
index 77b86795..6521b3bb 100644
--- a/openjdk/AssemblyInfo.java.in
+++ b/openjdk/AssemblyInfo.java.in
@@ -26,17 +26,17 @@
     "This software is licensed under the GNU General Public License version 2 + \"Classpath\" exception.\r\n" +
     "See http://www.gnu.org/software/classpath/license.html for details.\r\n" +
     "Copyright (C) 1988      AT&T\r\n" +
-    "Copyright (C) 2003-2004 BEA Systems\r\n" +
+    "Copyright (C) 2004      BEA Systems\r\n" +
     "Copyright (C) 1995      Colin Plumb\r\n" +
     "Copyright (C) 1999-2008 Free Software Foundation, Inc.\r\n" +
     "Copyright (C) 2001-2005 freebxml.org\r\n" +
     "Copyright (C) 1998      FundsXpress, Inc.\r\n" +
+    "Copyright (C) 2008-2011 i-net software\r\n" +
     "Copyright (C) 2000-2007 INRIA, France Telecom\r\n" +
     "Copyright (C) 1993-2005 International Business Machines, Inc.\r\n" +
-    "Copyright (C) 2002-2010 Jeroen Frijters\r\n" +
-    "Copyright (C) 2009      Oracle Corporation\r\n" +
+    "Copyright (C) 2002-2011 Jeroen Frijters\r\n" +
+    "Copyright (C) 1993-2010 Oracle and/or its affiliates\r\n" +
     "Copyright (C) 2007      Red Hat, Inc.\r\n" +
-    "Copyright (C) 1993-2010 Sun Microsystems, Inc.\r\n" +
     "Copyright (C) 1996-1998 Taligent, Inc.\r\n" +
     "Copyright (C) 2001-2002 Thai Open Source Software Center Ltd\r\n" +
     "Copyright (C) 1999-2006 The Apache Software Foundation\r\n" +
@@ -44,7 +44,6 @@
     "Copyright (C) 1997      The Open Group Research Institute\r\n" +
     "Copyright (C) 1991-2007 Unicode, Inc.\r\n" +
     "Copyright (C) 1999      Visual Numerics Inc.\r\n" +
-    "Copyright (C) 2008-2009 Volker Berlin (i-net software)\r\n" +
     "Copyright (C) 2003      Wily Technology, Inc.\r\n" +
     "Copyright (C) 2000-2004 World Wide Web Consortium"
 )