Merge branch 'master' into Gtk.

diff --cc src/blowfish/Makefile.am
Simple merge

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

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

diff --cc src/gdbm/Makefile.am
Simple merge

diff --cc src/mcrypt/Makefile.am
Simple merge

diff --cc src/md5/Makefile.am
Simple merge

diff --cc src/mhash/Makefile.am
Simple merge

diff --cc src/runtime/ed-ffi.scm
index 7baaea2d6eeddb568dbae047f9c6e5ba60907878,7f15cf7e0808044fac66578f5d0724a4b4a4cf2d..2df46ed3296c5eb3a5ecc1c52b7139a5c6e147a4
--- 1/src/runtime/ed-ffi.scm
--- 2/src/runtime/ed-ffi.scm
+++ b/src/runtime/ed-ffi.scm
@@@ -182,8 -201,11 +199,10 @@@ USA
      ("vector" (runtime vector))
      ("version"        (runtime))
      ("where"  (runtime environment-inspector))
+     ("w32-registry" (runtime win32-registry))
      ("wind"   (runtime state-space))
+     ("world-report" (runtime world-report))
      ("wrkdir" (runtime working-directory))
      ("wttree" (runtime wt-tree))
 -    ("x11graph"       (runtime X-graphics))
      ("xeval"  (runtime extended-scode-eval))
      ("ystep"  (runtime stepper))))

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

diff --cc src/x11-screen/Makefile.am
Simple merge

diff --cc src/x11/Makefile.am
Simple merge