# HG changeset patch
# User chegar
# Date 1295629453 0
# Node ID bea538812ec83cabdbbdc75f1e8cf86a82bf6b7f
# Parent  8168047d48c2d7197ad694d7fdad8e54c8e18c98# Parent  710d839c5cfad3e62a5be03c6258456e9c6998dc
Merge

diff -r 8168047d48c2 -r bea538812ec8 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Fri Jan 21 17:02:57 2011 +0000
+++ b/jdk/test/ProblemList.txt	Fri Jan 21 17:04:13 2011 +0000
@@ -439,6 +439,9 @@
 java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java generic-all
 java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java generic-all
 
+java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java         generic-all
+java/rmi/transport/dgcDeadLock/TestImpl_Stub.java                       generic-all
+
 # Address already in use, othervm mode, solaris
 java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java	generic-all
 java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	generic-all