# HG changeset patch
# User ohair
# Date 1296834457 28800
# Node ID 66fa0fcc779296c99746b09efce6109944f82f30
# Parent  3ff9acc7cc06a2b6333834b0d71a9448262bb829# Parent  6a3903e5b6cc2f86f992ce94f94009f4af03c251
Merge

diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 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
diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 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
diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 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
diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 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
diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 2004, 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
diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,6 +1,6 @@
 ;
 
-; Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 2009, 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
diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 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
diff -r 3ff9acc7cc06 -r 66fa0fcc7792 src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Thu Feb 03 17:22:01 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Fri Feb 04 07:47:37 2011 -0800
@@ -1,5 +1,5 @@
 ;
-; Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+; Copyright (c) 2003, 2004, 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