diff -r b6561c7643d5 -r 7255d544da96 AbstractTime.st
--- a/AbstractTime.st	Thu Apr 17 00:34:02 2014 +0200
+++ b/AbstractTime.st	Thu Apr 17 00:34:52 2014 +0200
@@ -897,7 +897,17 @@
 !AbstractTime methodsFor:'double dispatching'!
 
 differenceFromTimestamp:aTimestamp
-    ^ aTimestamp getSeconds - self getSeconds
+    "/ the correct thing to do (and I will, in the future) is to
+    "/ return a TimeDuration:
+    "/
+    ^ TimeDuration fromMilliseconds:(self getMilliseconds - (aTimestamp getMilliseconds))
+    "/ which is the same as: deltaFrom:aTimestamp
+    "/
+    "/ however, there might be old code around, which is not be prepared for
+    "/ getting a non-number (the seconds). Therefore, for the meantime,
+    "/ we return:
+
+    "/ ^ aTimestamp getSeconds - self getSeconds
 ! !
 
 !AbstractTime methodsFor:'printing & storing'!
@@ -1218,10 +1228,10 @@
 !AbstractTime class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.77 2013-08-23 00:19:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.78 2014-04-16 22:34:52 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.77 2013-08-23 00:19:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.78 2014-04-16 22:34:52 cg Exp $'
 ! !