Fix mismerge of UtfEncodedString.cls
Fix mismerge of UtfEncodedString.cls

shoshanatech/Dolphin,objectarts/Dolphin,blairmcg/Dolphin,blairmcg/Dolphin,objectarts/Dolphin,dolphinsmalltalk/Dolphin,dolphinsmalltalk/Dolphin,dolphinsmalltalk/Dolphin,shoshanatech/Dolphin,dolphinsmalltalk/Dolphin,jgfoster/Dolphin,blairmcg/Dolphin,shoshanatech/Dolphin,jgfoster/Dolphin,jgfoster/Dolphin,blairmcg/Dolphin,jgfoster/Dolphin,shoshanatech/Dolphin