# HG changeset patch
# User katleman
# Date 1366060798 25200
# Node ID c9eb0ec1c7922b4b81a3e1bc34f05f49adc64e9b
# Parent  511e334ee345ae770f6fe94730f03067907da454# Parent  b0301c02f38e8412c24f4b899e29a6bdbecf64cc
Merge

diff -r 511e334ee345 -r c9eb0ec1c792 make/bsd/makefiles/fastdebug.make
--- a/make/bsd/makefiles/fastdebug.make	Thu Apr 11 16:35:19 2013 -0700
+++ b/make/bsd/makefiles/fastdebug.make	Mon Apr 15 14:19:58 2013 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
diff -r 511e334ee345 -r c9eb0ec1c792 src/share/vm/services/diagnosticArgument.cpp
--- a/src/share/vm/services/diagnosticArgument.cpp	Thu Apr 11 16:35:19 2013 -0700
+++ b/src/share/vm/services/diagnosticArgument.cpp	Mon Apr 15 14:19:58 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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 511e334ee345 -r c9eb0ec1c792 test/sanity/WBApi.java
--- a/test/sanity/WBApi.java	Thu Apr 11 16:35:19 2013 -0700
+++ b/test/sanity/WBApi.java	Mon Apr 15 14:19:58 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 511e334ee345 -r c9eb0ec1c792 test/serviceability/ParserTest.java
--- a/test/serviceability/ParserTest.java	Thu Apr 11 16:35:19 2013 -0700
+++ b/test/serviceability/ParserTest.java	Mon Apr 15 14:19:58 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 511e334ee345 -r c9eb0ec1c792 test/testlibrary/whitebox/sun/hotspot/WhiteBox.java
--- a/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Thu Apr 11 16:35:19 2013 -0700
+++ b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Mon Apr 15 14:19:58 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 511e334ee345 -r c9eb0ec1c792 test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java
--- a/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java	Thu Apr 11 16:35:19 2013 -0700
+++ b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java	Mon Apr 15 14:19:58 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