--- a/String.st	Mon Dec 20 07:13:27 2010 +0000
+++ b/String.st	Fri Feb 04 23:09:23 2011 +0000
@@ -488,6 +488,8 @@
     ^ Character tab asString
 ! !
 
+
+
 !String class methodsFor:'queries'!
 
 defaultPlatformClass
@@ -507,16 +509,22 @@
     "Modified: 23.4.1996 / 16:00:38 / cg"
 ! !
 
+
+
+
 !String methodsFor:'Compatibility-VW5.4'!
 
 asGUID
-    "return self as a UUID"
-
+    "return self as a GUID (or UUID if not present)"
+
+    GUID notNil ifTrue:[ ^ GUID fromString:self ].
     ^ self asUUID
 
     "
      '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' asGUID
     "
+
+    "Modified: / 12-01-2011 / 12:33:58 / cg"
 ! !
 
 !String methodsFor:'accessing'!
@@ -697,6 +705,7 @@
     "
 ! !
 
+
 !String methodsFor:'character searching'!
 
 identityIndexOf:aCharacter
@@ -3243,6 +3252,7 @@
     ^ super reverse
 ! !
 
+
 !String methodsFor:'substring searching'!
 
 indexOfSubCollection:aSubString startingAt:startIndex ifAbsent:exceptionValue caseSensitive:caseSensitive
@@ -3706,18 +3716,19 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Id: String.st 10602 2010-12-20 07:13:27Z vranyj1 $'
+    ^ '$Id: String.st 10604 2011-02-04 23:09:23Z vranyj1 $'
 !
 
 version_CVS
-    ^ 'Header: /cvs/stx/stx/libbasic/String.st,v 1.272 2010/10/29 16:58:16 stefan Exp '
+    ^ 'Header: /cvs/stx/stx/libbasic/String.st,v 1.275 2011/01/12 13:51:12 cg Exp '
 !
 
 version_SVN
-    ^ '$Id: String.st 10602 2010-12-20 07:13:27Z vranyj1 $'
+    ^ '$Id: String.st 10604 2011-02-04 23:09:23Z vranyj1 $'
 ! !
 
 
 
 
 
+