# HG changeset patch
# User lana
# Date 1294187876 28800
# Node ID 466e89f7e5be8543272a1b054d5f7b858392109d
# Parent  8ac759987b08e244e515dc4d09a8659c52fc164f# Parent  86f60e5b3975840968f3147ddce047a27a9fc83e
Merge

diff -r 8ac759987b08 -r 466e89f7e5be build.properties
--- a/build.properties	Wed Dec 22 22:57:29 2010 -0800
+++ b/build.properties	Tue Jan 04 16:37:56 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
diff -r 8ac759987b08 -r 466e89f7e5be jaxws.properties
--- a/jaxws.properties	Wed Dec 22 22:57:29 2010 -0800
+++ b/jaxws.properties	Tue Jan 04 16:37:56 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
diff -r 8ac759987b08 -r 466e89f7e5be make/Makefile
--- a/make/Makefile	Wed Dec 22 22:57:29 2010 -0800
+++ b/make/Makefile	Tue Jan 04 16:37:56 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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