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
