[multiple changes]

2004-09-21  Andreas Tobler  <a.tobler@schweiz.ch>

	* javax/security/auth/x500/X500Principal.java: Fix some merge glitches.

2004-09-21  Michael Koch  <konqueror@gmx.de>

	* javax/net/ssl/SSLServerSocket.java:
	Removed comment about "Do not edit this file, it's generated.".

From-SVN: r87800

libjava/ChangeLog

 2004-09-21  Andreas Tobler  <a.tobler@schweiz.ch>
 
+	* javax/security/auth/x500/X500Principal.java: Fix some merge glitches.
+
+2004-09-21  Michael Koch  <konqueror@gmx.de>
+
+	* javax/net/ssl/SSLServerSocket.java:
+	Removed comment about "Do not edit this file, it's generated.".
+
+2004-09-21  Andreas Tobler  <a.tobler@schweiz.ch>
+
 	Import the big Crypto/Jessie/Security merge from Classpath.
 
 	* Makefile.am: Add imported files.

libjava/javax/net/ssl/SSLServerSocket.java

-// THIS IS A GENERATED FILE. DO NOT EDIT. -*- buffer-read-only: t -*-
 /* SSLServerSocket.java -- a server socket for SSL connections.
    Copyright (C) 2004 Free Software Foundation, Inc.