--- a/AbstractTime.st	Wed Feb 04 16:13:22 2009 +0100
+++ b/AbstractTime.st	Thu Feb 05 14:59:02 2009 +0100
@@ -409,6 +409,7 @@
     "
 ! !
 
+
 !AbstractTime methodsFor:'abstract'!
 
 hours
@@ -539,16 +540,18 @@
 - aTimeOrNumberOfSeconds
     "return the delta in seconds between 2 times or subtract a number of seconds."
 
-    aTimeOrNumberOfSeconds isNumber ifTrue:[
-        ^ self species basicNew 
-            setMilliseconds:(self getMilliseconds - (aTimeOrNumberOfSeconds * 1000) asInteger)
-    ].
-    ^ self getSeconds - aTimeOrNumberOfSeconds getSeconds
-
-
+"/    aTimeOrNumberOfSeconds isNumber ifTrue:[
+"/        ^ self species basicNew 
+"/            setMilliseconds:(self getMilliseconds - (aTimeOrNumberOfSeconds * 1000) asInteger)
+"/    ].
+"/    ^ self getSeconds - aTimeOrNumberOfSeconds getSeconds
+    ^ aTimeOrNumberOfSeconds differenceFromTimestamp:self.
 
     "
-     Timestamp now - 3600.
+     Timestamp now - 3600. 
+     Time now - 3600.   
+     (TimeDuration fromString:'1.5hr') - 3600.   
+     (TimeDuration fromString:'1.5hr') - (TimeDuration fromString:'1hr')   
 
      |t1 t2|
 
@@ -1057,5 +1060,5 @@
 !AbstractTime class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.59 2008-08-06 10:25:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.60 2009-02-05 13:59:02 sr Exp $'
 ! !