# HG changeset patch
# User katleman
# Date 1366149649 25200
# Node ID 6ab578e141dfd17c4dc03869bb204aafa490c9f4
# Parent  1f19b84efa6dfdaefef6e525ba69ef580b905d13# Parent  717bcda533f2b504787d21ad9be2c26d7e7c2a96
Merge

diff -r 1f19b84efa6d -r 6ab578e141df test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
--- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Tue Apr 16 08:16:07 2013 -0700
+++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Tue Apr 16 15:00:49 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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 1f19b84efa6d -r 6ab578e141df test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java
--- a/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Tue Apr 16 08:16:07 2013 -0700
+++ b/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Tue Apr 16 15:00:49 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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 1f19b84efa6d -r 6ab578e141df test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
--- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 16 08:16:07 2013 -0700
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 16 15:00:49 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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 1f19b84efa6d -r 6ab578e141df test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java
--- a/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Tue Apr 16 08:16:07 2013 -0700
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Tue Apr 16 15:00:49 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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