--- a/Semaphore.st	Fri Feb 12 11:35:56 2016 +0000
+++ b/Semaphore.st	Sat Feb 13 07:51:52 2016 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#Semaphore
 	instanceVariableNames:'count waitingProcesses lastOwnerId name'
 	classVariableNames:''
@@ -981,7 +983,7 @@
     "Modified: / 11-08-2011 / 14:37:00 / cg"
 !
 
-waitWithTimeout:seconds
+waitWithTimeout:secondsOrNilOrTimeDuration
     "wait for the semaphore, but abort the wait after some time (seconds).
      return the receiver if the semaphore triggered normal, nil if we return
      due to a timeout.
@@ -993,8 +995,8 @@
 
     |millis|
 
-    seconds notNil ifTrue:[
-	millis := seconds * 1000
+    secondsOrNilOrTimeDuration notNil ifTrue:[
+        millis := secondsOrNilOrTimeDuration asFloat * 1000
     ].
     ^ self waitWithTimeoutMs:millis.
 !
@@ -1181,10 +1183,10 @@
 !Semaphore class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Semaphore.st,v 1.99 2014-10-20 22:41:22 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Semaphore.st,v 1.99 2014-10-20 22:41:22 stefan Exp $'
+    ^ '$Header$'
 ! !