Back out a part of the fix for bug 224231 to see if it affects btek's Tp.

content/base/src/nsGenericDOMDataNode.cpp

@@ -1343,7 +1343,7 @@ nsGenericDOMDataNode::AppendTextTo(nsAString& aResult)
   if (mText.Is2b()) {
     aResult.Append(mText.Get2b(), mText.GetLength());
   } else {
-    AppendASCIItoUTF16(mText.Get1b(), aResult);
+    AppendUTF8toUTF16(mText.Get1b(), aResult);
   }
 
   return NS_OK;

content/html/content/src/nsAttributeContent.cpp

@@ -573,7 +573,7 @@ nsAttributeContent::AppendTextTo(nsAString& aResult)
     aResult.Append(mText.Get2b(), mText.GetLength());
   }
   else {
-    AppendASCIItoUTF16(mText.Get1b(), aResult);
+    AppendUTF8toUTF16(mText.Get1b(), aResult);
   }
 
   return NS_OK;

netwerk/streamconv/converters/nsIndexedToHTML.cpp

@@ -299,7 +299,7 @@ nsIndexedToHTML::OnStartRequest(nsIRequest* request, nsISupports *aContext) {
     buffer.Append(strNCR);
 
     buffer.Append(NS_LITERAL_STRING("</title><base href=\""));    
-    AppendASCIItoUTF16(baseUri, buffer);
+    buffer.Append(NS_ConvertASCIItoUCS2(baseUri));
     buffer.Append(NS_LITERAL_STRING("\"/>\n"));
 
     buffer.Append(NS_LITERAL_STRING("<style type=\"text/css\">\n") +