# HG changeset patch
# User lana
# Date 1366259585 25200
# Node ID db9c527a1fd8e9cdbf62e8a3d872e11ca8db66ed
# Parent  86db4847f195c0ecceea646431f1ff22d56282e8# Parent  6c560f9ebb3e5894adedd1a082e37eaebb84684f
Merge

diff -r 6c560f9ebb3e -r db9c527a1fd8 make/bsd/makefiles/fastdebug.make
--- a/make/bsd/makefiles/fastdebug.make	Wed Apr 17 10:12:42 2013 -0700
+++ b/make/bsd/makefiles/fastdebug.make	Wed Apr 17 21:33:05 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 6c560f9ebb3e -r db9c527a1fd8 src/share/vm/services/diagnosticArgument.cpp
--- a/src/share/vm/services/diagnosticArgument.cpp	Wed Apr 17 10:12:42 2013 -0700
+++ b/src/share/vm/services/diagnosticArgument.cpp	Wed Apr 17 21:33:05 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 6c560f9ebb3e -r db9c527a1fd8 test/sanity/WBApi.java
--- a/test/sanity/WBApi.java	Wed Apr 17 10:12:42 2013 -0700
+++ b/test/sanity/WBApi.java	Wed Apr 17 21:33:05 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 6c560f9ebb3e -r db9c527a1fd8 test/serviceability/ParserTest.java
--- a/test/serviceability/ParserTest.java	Wed Apr 17 10:12:42 2013 -0700
+++ b/test/serviceability/ParserTest.java	Wed Apr 17 21:33:05 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 6c560f9ebb3e -r db9c527a1fd8 test/testlibrary/whitebox/sun/hotspot/WhiteBox.java
--- a/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Wed Apr 17 10:12:42 2013 -0700
+++ b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Wed Apr 17 21:33:05 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 6c560f9ebb3e -r db9c527a1fd8 test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java
--- a/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java	Wed Apr 17 10:12:42 2013 -0700
+++ b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java	Wed Apr 17 21:33:05 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