# HG changeset patch
# User katleman
# Date 1373578458 25200
# Node ID cfb454f77f836760e1851e809d4962a0995ef53a
# Parent  487d977c44f741781e0c6dfa9a67cfd64a9c1a0f# Parent  8d76edc6d73e1ec22d6548f2f04c969068fa2bf6
Merge

diff -r 487d977c44f7 -r cfb454f77f83 jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java
--- a/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java	Thu Jul 11 10:13:49 2013 -0700
+++ b/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java	Thu Jul 11 14:34:18 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 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
@@ -16,10 +16,10 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+*/
 
 /*
  * @test