Merge branch 'master' into pucked.

diff --cc src/Makefile.in
Simple merge

diff --cc src/Setup.sh
Simple merge

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

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

diff --cc src/runtime/ed-ffi.scm
index 219b13d00e2da6462af8cd0f36d06bf03fc39521,ea05763f3048f9f2a1ca89c8d6fbf9f356d671af..3dd670ce03f657e916080b107b0cad74042134a1
--- 1/src/runtime/ed-ffi.scm
--- 2/src/runtime/ed-ffi.scm
+++ b/src/runtime/ed-ffi.scm
@@@ -121,8 -122,8 +121,7 @@@ USA
      ("packag" (package))
      ("parse"  (runtime parser))
      ("parser-buffer" (runtime parser-buffer))
-     ("partab" (runtime parser-table))
      ("pathnm" (runtime pathname))
 -    ("pgsql"  (runtime postgresql))
      ("poplat" (runtime population))
      ("port"   (runtime port))
      ("pp"     (runtime pretty-printer))

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

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

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

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

diff --cc tests/check.scm
index 0ee1cf5b58644976ec339c7fbf61df60d8ae6fd6,22e57e7f9f01d127ad5ebb6ba076ad53ba621699..1ccdec9cc87e6ba5d7783188d9d1b9d254450198
--- 1/tests/check.scm
--- 2/tests/check.scm
+++ b/tests/check.scm
@@@ -69,9 -70,10 +70,10 @@@ USA
      "runtime/test-readwrite"
      "runtime/test-regsexp"
      "runtime/test-string"
+     "runtime/test-string-normalization"
      "runtime/test-url"
      ("runtime/test-wttree" (runtime wt-tree))
 -    ;;"ffi/test-ffi"
 +    "ffi/test-ffi.scm"
      ))
  
  (with-working-directory-pathname