# HG changeset patch
# User ohair
# Date 1292455491 28800
# Node ID fa02141b22b682b9306625b5b0ffc4d249d618e5
# Parent  6f09ea1c034f087916d2a8cf0d22be768400118f# Parent  772fec2fe33453945550d2bc8a8b547b4f6d542b
Merge

diff -r 6f09ea1c034f -r fa02141b22b6 make/templates/bsd-header
--- a/make/templates/bsd-header	Wed Jul 05 17:29:14 2017 +0200
+++ 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 6f09ea1c034f -r fa02141b22b6 make/templates/gpl-cp-header
--- a/make/templates/gpl-cp-header	Wed Jul 05 17:29:14 2017 +0200
+++ 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 6f09ea1c034f -r fa02141b22b6 make/templates/gpl-header
--- a/make/templates/gpl-header	Wed Jul 05 17:29:14 2017 +0200
+++ 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.
+