--- a/Time.st	Sun Jan 16 10:20:09 2011 +0100
+++ b/Time.st	Sun Jan 16 11:28:01 2011 +0100
@@ -249,6 +249,16 @@
 
 !Time class methodsFor:'format strings'!
 
+defaultFormatString
+    LanguageTerritory == #us ifTrue:[
+        ^ self formatString12us
+    ] ifFalse:[
+        ^ self formatString24
+    ]
+
+    "Created: / 16-01-2011 / 11:23:36 / cg"
+!
+
 formatString12us
     "return the format string used to format US times (and other areas)"
 
@@ -261,6 +271,7 @@
     ^ '%h:%m:%s'
 ! !
 
+
 !Time methodsFor:'Compatibility-Squeak'!
 
 intervalString
@@ -461,11 +472,6 @@
 
 !Time methodsFor:'converting'!
 
-asNative
-	#swAdded.
-	^self
-!
-
 asSeconds
     "return the number of seconds elapsed since midnight"
 
@@ -594,17 +600,15 @@
      depending on the setting of LanguageTerritory.
      I dont know what ST-80 does here (12-hour format ?)"
 
-    LanguageTerritory == #us ifTrue:[
-        self print12HourFormatOn:aStream
-    ] ifFalse:[
-        self print24HourFormatOn:aStream
-    ]
+    ^ self
+        printOn:aStream 
+        format:(self class defaultFormatString)               
 
     "
      Time now printOn:Transcript. Transcript cr
     "
 
-    "Modified: 22.2.1996 / 16:58:30 / cg"
+    "Modified: / 16-01-2011 / 11:27:24 / cg"
 !
 
 printString12HourFormat
@@ -711,12 +715,13 @@
     timeEncoding := encoding
 ! !
 
+
 !Time class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Time.st,v 1.87 2010-03-31 09:39:45 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Time.st,v 1.88 2011-01-16 10:28:01 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Time.st,v 1.87 2010-03-31 09:39:45 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Time.st,v 1.88 2011-01-16 10:28:01 cg Exp $'
 ! !