# HG changeset patch
# User cl
# Date 1284583274 25200
# Node ID 32da0f38d2fe96c558492b8707b40da24643d41e
# Parent  1c13c5ea73b5e4286c2a570a5b0be0a9c8dee68e# Parent  b599cc9a9c2221d5ecd37312854ec10aaf9a910e
Merge

diff -r 1c13c5ea73b5 -r 32da0f38d2fe test/tools/javac/generics/inference/6938454/T6938454a.java
--- a/test/tools/javac/generics/inference/6938454/T6938454a.java	Thu Sep 09 15:08:03 2010 -0700
+++ b/test/tools/javac/generics/inference/6938454/T6938454a.java	Wed Sep 15 13:41:14 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates. 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
@@ -16,9 +16,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /*
diff -r 1c13c5ea73b5 -r 32da0f38d2fe test/tools/javac/generics/inference/6938454/T6938454b.java
--- a/test/tools/javac/generics/inference/6938454/T6938454b.java	Thu Sep 09 15:08:03 2010 -0700
+++ b/test/tools/javac/generics/inference/6938454/T6938454b.java	Wed Sep 15 13:41:14 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates. 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
@@ -16,9 +16,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 import java.util.List;