# HG changeset patch
# User katleman
# Date 1366060866 25200
# Node ID 717bcda533f2b504787d21ad9be2c26d7e7c2a96
# Parent  2c9acb17f41a67b089c88d904a7955b9071e3ff3# Parent  2b585be0da7adcab40a022059fef1ab93f5c53aa
Merge

diff -r 2c9acb17f41a -r 717bcda533f2 test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
--- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Mon Apr 15 14:21:06 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 2c9acb17f41a -r 717bcda533f2 test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java
--- a/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Mon Apr 15 14:21:06 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 2c9acb17f41a -r 717bcda533f2 test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
--- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Mon Apr 15 14:21:06 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 2c9acb17f41a -r 717bcda533f2 test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java
--- a/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Mon Apr 15 14:21:06 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