# HG changeset patch
# User katleman
# Date 1356560638 28800
# Node ID 6ca279338b6b67a7bfcc59c0a9591bbc4294be1c
# Parent  dbaaf66c0a5b70ccd0b75548a84428f151134326# Parent  ede328b35431b94580972f9e970735381fc3d9ea
Merge

diff -r dbaaf66c0a5b -r 6ca279338b6b jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java
--- a/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Dec 20 09:18:07 2012 -0800
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Wed Dec 26 14:23:58 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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 dbaaf66c0a5b -r 6ca279338b6b jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java
--- a/jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Thu Dec 20 09:18:07 2012 -0800
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Wed Dec 26 14:23:58 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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