Merge branch 'master' into Gtk.

diff --cc dist/shared.sh
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/compiler/Stage.sh
Simple merge

diff --cc src/edwin/editor.scm
Simple merge

diff --cc src/etc/Stage.sh
Simple merge

diff --cc src/etc/compile-boot-compiler.sh
Simple merge

diff --cc src/etc/compile-svm.sh
Simple merge

diff --cc src/microcode/cmpauxmd/i386.m4
Simple merge

diff --cc src/microcode/cmpauxmd/x86-64.m4
Simple merge

diff --cc src/microcode/cmpintmd/x86-64.c
Simple merge

diff --cc src/microcode/errors.h
Simple merge

diff --cc src/microcode/ntio.c
Simple merge

diff --cc src/microcode/os2io.c
Simple merge

diff --cc src/microcode/osio.h
Simple merge

diff --cc src/microcode/prosio.c
Simple merge

diff --cc src/microcode/pruxffi.c
Simple merge

diff --cc src/microcode/uxio.c
Simple merge

diff --cc src/microcode/uxsig.c
Simple merge

diff --cc src/runtime/io.scm
Simple merge

diff --cc src/runtime/option.scm
Simple merge

diff --cc src/runtime/process.scm
Simple merge

diff --cc src/runtime/syncproc.scm
Simple merge

diff --cc src/runtime/thread.scm
Simple merge

diff --cc tests/check.scm
index 609db138f9de0ba57ebf7f9edb16d9381d28ba30,0805661a25f5f2b63428471e22a0abbcc858616c..ef65de78e12f5de9b3d512e0640c3a93d06bed51
--- 1/tests/check.scm
--- 2/tests/check.scm
+++ b/tests/check.scm
@@@ -52,8 -52,9 +52,9 @@@ USA
      "runtime/test-process"
      "runtime/test-readwrite"
      "runtime/test-regsexp"
+     "runtime/test-url"
      ("runtime/test-wttree" (runtime wt-tree))
 -    ;;"ffi/test-ffi"
 +    "ffi/test-ffi.scm"
      ))
  
  (with-working-directory-pathname

diff --cc tests/ffi/test-ffi.scm
Simple merge

diff --cc tests/runtime/test-char-set.scm
Simple merge

diff --cc tests/runtime/test-hash-table.scm
Simple merge