diff -cr ./simpletest.org/dumper.php ./simpletest/dumper.php
*** ./simpletest.org/dumper.php	Fri Sep 24 22:06:29 2010
--- ./simpletest/dumper.php	Fri Sep 24 22:03:03 2010
***************
*** 116,122 ****
       *    @access public
       */
      function clipString($value, $size, $position = 0) {
!         $length = strlen($value);
          if ($length <= $size) {
              return $value;
          }
--- 116,122 ----
       *    @access public
       */
      function clipString($value, $size, $position = 0) {
!         $length = mb_strlen($value, "UTF-8");
          if ($length <= $size) {
              return $value;
          }
***************
*** 125,131 ****
          if ($start + $size > $length) {
              $start = $length - $size;
          }
!         $value = substr($value, $start, $size);
          return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
      }
      
--- 125,131 ----
          if ($start + $size > $length) {
              $start = $length - $size;
          }
!         $value = mb_substr($value, $start, $size, "UTF-8");
          return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
      }
      
diff -cr ./simpletest.org/web_tester.php ./simpletest/web_tester.php
*** ./simpletest.org/web_tester.php	Fri Sep 24 22:06:14 2010
--- ./simpletest/web_tester.php	Fri Sep 24 21:59:17 2010
***************
*** 367,373 ****
       *    @access protected
       */
      function _describeTextMatch($substring, $subject) {
!         $position = strpos($subject, $substring);
          $dumper = &$this->_getDumper();
          return "Text [$substring] detected at character [$position] in [" .
                  $dumper->describeValue($subject) . "] in region [" .
--- 367,373 ----
       *    @access protected
       */
      function _describeTextMatch($substring, $subject) {
!         $position = mb_strpos($subject, $substring);
          $dumper = &$this->_getDumper();
          return "Text [$substring] detected at character [$position] in [" .
                  $dumper->describeValue($subject) . "] in region [" .