# HG changeset patch
# User katleman
# Date 1366227538 25200
# Node ID 86db4847f195c0ecceea646431f1ff22d56282e8
# Parent  5201379fe48713a26b46b89c9fd3e4c9210a5e85# Parent  c9eb0ec1c7922b4b81a3e1bc34f05f49adc64e9b
Merge

diff -r 5201379fe487 -r 86db4847f195 make/bsd/makefiles/fastdebug.make
--- a/make/bsd/makefiles/fastdebug.make	Thu Apr 11 21:45:21 2013 -0700
+++ b/make/bsd/makefiles/fastdebug.make	Wed Apr 17 12:38: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 5201379fe487 -r 86db4847f195 src/share/vm/services/diagnosticArgument.cpp
--- a/src/share/vm/services/diagnosticArgument.cpp	Thu Apr 11 21:45:21 2013 -0700
+++ b/src/share/vm/services/diagnosticArgument.cpp	Wed Apr 17 12:38: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 5201379fe487 -r 86db4847f195 test/sanity/WBApi.java
--- a/test/sanity/WBApi.java	Thu Apr 11 21:45:21 2013 -0700
+++ b/test/sanity/WBApi.java	Wed Apr 17 12:38: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 5201379fe487 -r 86db4847f195 test/serviceability/ParserTest.java
--- a/test/serviceability/ParserTest.java	Thu Apr 11 21:45:21 2013 -0700
+++ b/test/serviceability/ParserTest.java	Wed Apr 17 12:38: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 5201379fe487 -r 86db4847f195 test/testlibrary/whitebox/sun/hotspot/WhiteBox.java
--- a/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Thu Apr 11 21:45:21 2013 -0700
+++ b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Wed Apr 17 12:38: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 5201379fe487 -r 86db4847f195 test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java
--- a/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java	Thu Apr 11 21:45:21 2013 -0700
+++ b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java	Wed Apr 17 12:38: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