--- a/CVSSourceCodeManager.st	Sat Jan 07 14:04:35 2012 +0100
+++ b/CVSSourceCodeManager.st	Sun Jan 08 19:39:23 2012 +0100
@@ -15,7 +15,7 @@
 	instanceVariableNames:''
 	classVariableNames:'Verbose CVSRoot RemoteCVS CVSModuleRoots CMD_checkout CVSTempDir
 		DisabledModules CVSCommandSemaphore CVSExecutable
-		CVSCommitOptions CVSUpdateOptions
+		CVSCommitOptions CVSUpdateOptions CVSCommandTimeout
 		RecentlyCheckedModulesAndPackages'
 	poolDictionaries:''
 	category:'System-SourceCodeManagement'
@@ -340,6 +340,18 @@
     "Created: / 21-09-2006 / 17:26:43 / cg"
 !
 
+cvsCommandTimeout
+    ^ CVSCommandTimeout ? ("360" 120 seconds)
+
+    "Modified (comment): / 08-01-2012 / 19:02:44 / cg"
+!
+
+cvsCommandTimeout:aTimeDuration
+    CVSCommandTimeout := aTimeDuration asTimeDuration.
+
+    "Created: / 08-01-2012 / 19:36:01 / cg"
+!
+
 cvsExecutable
     "return the name of the cvs executable."
 
@@ -861,13 +873,6 @@
     "Modified: / 29-08-2006 / 13:16:23 / cg"
 !
 
-cvsCommandTimeout
-    ^ 120. "/ seconds
-"/    ^ 360 "/ seconds
-
-    "Modified: / 05-01-2012 / 14:12:51 / cg"
-!
-
 cvsTimeString:timestamp
     "convert a Timestamp to a string suitable for the CVS/Entries file:
 
@@ -1059,7 +1064,7 @@
                     done := false.
                     [done] whileFalse:[
                         done := true.
-                        (p waitUntilTerminatedWithTimeout:self cvsCommandTimeout) ifTrue:[
+                        (p waitUntilTerminatedWithTimeout:self cvsCommandTimeout asSeconds) ifTrue:[
                             (Dialog confirm:('CVS command timeout (%1s) for:\\%2\\Proceed?' withCRs 
                                                     bindWith:self cvsCommandTimeout with:command)) ifTrue:[
                                 done := false
@@ -1093,7 +1098,7 @@
     "Created: / 20-05-1998 / 16:06:34 / cg"
     "Modified: / 10-10-2011 / 14:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 13-10-2011 / 17:06:28 / jv"
-    "Modified: / 07-01-2012 / 13:29:55 / cg"
+    "Modified: / 08-01-2012 / 19:32:55 / cg"
 !
 
 getCVSROOTForModule:aModuleName
@@ -5060,11 +5065,11 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.417 2012-01-07 13:04:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.418 2012-01-08 18:39:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.417 2012-01-07 13:04:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.418 2012-01-08 18:39:23 cg Exp $'
 ! !
 
 CVSSourceCodeManager initialize!