--- a/Socket.st	Sat Feb 09 01:21:12 2013 +0100
+++ b/Socket.st	Sat Feb 09 01:21:56 2013 +0100
@@ -1620,8 +1620,11 @@
     ^ self
 !
 
-waitForConnectionUntil:aMillisecondClockValue
-    self readWaitWithTimeoutMs: aMillisecondClockValue.
+waitForConnectionUntil:aTimestamp
+    "return true if connected"
+
+    self readWaitWithTimeoutMs: (aTimestamp millisecondDeltaFrom:Timestamp now).
+    ^ self isConnected
 !
 
 waitForData
@@ -4056,10 +4059,10 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.276 2013-02-08 20:35:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.277 2013-02-09 00:21:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.276 2013-02-08 20:35:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.277 2013-02-09 00:21:56 cg Exp $'
 ! !