# HG changeset patch
# User lana
# Date 1294187320 28800
# Node ID 3a829f5ba9d2d529930361c4b0c842eedd7610ae
# Parent  ce7b69a2d927040c7a865613d269594166885e48# Parent  57ed1f3bec72924cdad102f9bf90f7449ea7bb83
Merge

diff -r ce7b69a2d927 -r 3a829f5ba9d2 build.properties
--- a/build.properties	Wed Dec 22 22:57:26 2010 -0800
+++ b/build.properties	Tue Jan 04 16:28:40 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 ce7b69a2d927 -r 3a829f5ba9d2 make/Makefile
--- a/make/Makefile	Wed Dec 22 22:57:26 2010 -0800
+++ b/make/Makefile	Tue Jan 04 16:28:40 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