--- a/Stream.st	Wed May 06 06:59:44 2015 +0200
+++ b/Stream.st	Sun May 10 07:10:08 2015 +0100
@@ -226,6 +226,7 @@
 ! !
 
 
+
 !Stream methodsFor:'accessing'!
 
 contents
@@ -3017,7 +3018,7 @@
     ^ self readWaitWithTimeoutMs:timeout
 !
 
-readWaitWithTimeout:secondsOrTimeDuration
+readWaitWithTimeout:secondsOrTimeDurationOrNil
     "suspend the current process, until the receiver
      becomes ready for reading or a timeout (in seconds) expired.
      If data is already available, return immediate.
@@ -3027,11 +3028,11 @@
 
     |ms|
 
-    secondsOrTimeDuration notNil ifTrue:[
-        secondsOrTimeDuration isNumber ifTrue:[
-            ms := secondsOrTimeDuration * 1000.
+    secondsOrTimeDurationOrNil notNil ifTrue:[
+        secondsOrTimeDurationOrNil isNumber ifTrue:[
+            ms := secondsOrTimeDurationOrNil * 1000.
         ] ifFalse:[
-            ms := secondsOrTimeDuration getMilliseconds.
+            ms := secondsOrTimeDurationOrNil getMilliseconds.
         ]
     ].
     ^ self readWaitWithTimeoutMs:ms
@@ -3784,11 +3785,11 @@
 !Stream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.242 2015-03-25 22:28:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.243 2015-05-08 01:06:57 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.242 2015-03-25 22:28:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.243 2015-05-08 01:06:57 cg Exp $'
 ! !