# HG changeset patch
# User ohair
# Date 1302658602 25200
# Node ID be3758943770a0a3dd4be6a1cb4063507c4d7062
# Parent  d19dd3dd599e7ac528e1e3a1a0662261d40228b9# Parent  bc701b263f16fb2d428b335b694c87fe5843c246
Merge

diff -r d19dd3dd599e -r be3758943770 build-defs.xml
--- a/build-defs.xml	Thu Apr 07 15:21:03 2011 -0700
+++ b/build-defs.xml	Tue Apr 12 18:36:42 2011 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 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 d19dd3dd599e -r be3758943770 build-drop-template.xml
--- a/build-drop-template.xml	Thu Apr 07 15:21:03 2011 -0700
+++ b/build-drop-template.xml	Tue Apr 12 18:36:42 2011 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 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 d19dd3dd599e -r be3758943770 build.xml
--- a/build.xml	Thu Apr 07 15:21:03 2011 -0700
+++ b/build.xml	Tue Apr 12 18:36:42 2011 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 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 d19dd3dd599e -r be3758943770 jaxp.properties
--- a/jaxp.properties	Thu Apr 07 15:21:03 2011 -0700
+++ b/jaxp.properties	Tue Apr 12 18:36:42 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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 d19dd3dd599e -r be3758943770 make/Makefile
--- a/make/Makefile	Thu Apr 07 15:21:03 2011 -0700
+++ b/make/Makefile	Tue Apr 12 18:36:42 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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