# HG changeset patch
# User katleman
# Date 1366060866 25200
# Node ID 922ed9a2c5effe84b21d518aa6b2fc225c74b9aa
# Parent  3441b1c548700ff087e34196b8144ab1b166a2f9# Parent  6313f8ad02f8da3f26d531c8963dd8823e634d90
Merge

diff -r 3441b1c54870 -r 922ed9a2c5ef langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
--- a/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/langtools/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 3441b1c54870 -r 922ed9a2c5ef langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java
--- a/langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/langtools/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 3441b1c54870 -r 922ed9a2c5ef langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/langtools/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 3441b1c54870 -r 922ed9a2c5ef langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java
--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Thu Apr 11 09:40:22 2013 -0700
+++ b/langtools/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