Merge branch 'master' into Gtk.

diff --cc dist/shared.sh
index 7a05e6e265b8d8bc6e598278a7d05fef21db9f94,7d5e681a407089591c3eeb13fcea90c62614e265..9ea2d9e89c0fd72bb30a468d481c224f05f2c423
--- 1/dist/shared.sh
--- 2/dist/shared.sh
+++ b/dist/shared.sh
@@@ -100,7 -100,7 +100,7 @@@ LIARC_OUT=${OUTPUT_DIR}/liar
  NATIVE_OUT=${OUTPUT_DIR}/native
  MACOSX_OUT=${OUTPUT_DIR}/macosx
  
- PLUGINS="blowfish gdbm md5 mhash gtk gl"
 -PLUGINS="blowfish gdbm mcrypt md5 mhash"
++PLUGINS="blowfish gdbm mcrypt md5 mhash gtk gl"
  
  notify ()
  {

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

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

diff --cc src/runtime/runtime.pkg
Simple merge

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