# HG changeset patch
# User katleman
# Date 1368559179 25200
# Node ID 1a8b44cae0815483b26af70b750150bdcf648bc3
# Parent  d0e193acb66833a5fd1d3a967c76bfe12e2c887d# Parent  3cfbb50b9fb7f2fbd654125dd7ac16600550d060
Merge

diff -r d0e193acb668 -r 1a8b44cae081 jdk/src/share/classes/java/util/Base64.java
--- a/jdk/src/share/classes/java/util/Base64.java	Thu May 09 10:04:20 2013 -0700
+++ b/jdk/src/share/classes/java/util/Base64.java	Tue May 14 12:19:39 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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 d0e193acb668 -r 1a8b44cae081 jdk/src/share/classes/java/util/StringJoiner.java
--- a/jdk/src/share/classes/java/util/StringJoiner.java	Thu May 09 10:04:20 2013 -0700
+++ b/jdk/src/share/classes/java/util/StringJoiner.java	Tue May 14 12:19:39 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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 d0e193acb668 -r 1a8b44cae081 jdk/test/java/lang/CharSequence/DefaultTest.java
--- a/jdk/test/java/lang/CharSequence/DefaultTest.java	Thu May 09 10:04:20 2013 -0700
+++ b/jdk/test/java/lang/CharSequence/DefaultTest.java	Tue May 14 12:19:39 2013 -0700
@@ -1,12 +1,10 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
+ * published by the Free Software Foundation.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff -r d0e193acb668 -r 1a8b44cae081 jdk/test/java/util/StringJoiner/StringJoinerTest.java
--- a/jdk/test/java/util/StringJoiner/StringJoinerTest.java	Thu May 09 10:04:20 2013 -0700
+++ b/jdk/test/java/util/StringJoiner/StringJoinerTest.java	Tue May 14 12:19:39 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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