# HG changeset patch
# User mfang
# Date 1297496152 28800
# Node ID 563a8f8b5be3940e9346cffac4eff9ed02b3c69f
# Parent  e0f0b358cd2c9d494c234b5a74fe6986350a22ee# Parent  4cdf9b86f55040c543e6af704f0a0c6738d1b243
Merge

diff -r e0f0b358cd2c -r 563a8f8b5be3 .hgtags
--- a/.hgtags	Fri Feb 11 22:50:26 2011 -0800
+++ b/.hgtags	Fri Feb 11 23:35:52 2011 -0800
@@ -103,3 +103,4 @@
 d7532bcd3742f1576dd07ff9fbb535c9c9a276e9 jdk7-b126
 64775e83f4df894355f45555f50c410de6727b4e jdk7-b127
 9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128
+66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129
diff -r e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc	Fri Feb 11 23:35:52 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 e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc	Fri Feb 11 23:35:52 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 e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc	Fri Feb 11 23:35:52 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 e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc	Fri Feb 11 23:35:52 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 e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc	Fri Feb 11 23:35:52 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 e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Fri Feb 11 23:35:52 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 e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc	Fri Feb 11 23:35:52 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 e0f0b358cd2c -r 563a8f8b5be3 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	Fri Feb 11 22:50:26 2011 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc	Fri Feb 11 23:35:52 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