# HG changeset patch
# User ohair
# Date 1292455491 28800
# Node ID 5be437606a75a0d68ceceea1284ec27def226dbc
# Parent  f1591eed71f64f6eba79fb7426f5616cc4dfea73# Parent  55566844106b29660df041afcbe4d9b66c97cf5a
Merge

diff -r f1591eed71f6 -r 5be437606a75 make/templates/bsd-header
--- a/make/templates/bsd-header	Thu Dec 09 21:25:18 2010 -0800
+++ b/make/templates/bsd-header	Wed Dec 15 15:24:51 2010 -0800
@@ -1,4 +1,4 @@
-Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -26,3 +26,4 @@
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff -r f1591eed71f6 -r 5be437606a75 make/templates/gpl-cp-header
--- a/make/templates/gpl-cp-header	Thu Dec 09 21:25:18 2010 -0800
+++ b/make/templates/gpl-cp-header	Wed Dec 15 15:24:51 2010 -0800
@@ -1,4 +1,4 @@
-Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright (c) %YEARS% 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
@@ -20,3 +20,4 @@
 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 f1591eed71f6 -r 5be437606a75 make/templates/gpl-header
--- a/make/templates/gpl-header	Thu Dec 09 21:25:18 2010 -0800
+++ b/make/templates/gpl-header	Wed Dec 15 15:24:51 2010 -0800
@@ -1,4 +1,4 @@
-Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright (c) %YEARS% 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
@@ -18,3 +18,4 @@
 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.
+