Merge branch 'master' into pucked.

diff --cc src/gdbm/gdbm.scm
Simple merge

diff --cc src/x11/x11.pkg
index ceb8d09abdeca2a16056b6bb0bedfd245d102ba4,c67e3ae6bd5d466ca006157b142f98605d4ae95d..8487a47d68f6c9489f7af87fd5bbb4fbece99e05
--- 1/src/x11/x11.pkg
--- 2/src/x11/x11.pkg
+++ b/src/x11/x11.pkg
@@@ -33,12 -33,15 +33,16 @@@ Inc., 51 Franklin St, Fifth Floor, Bost
  (define-package (x11 base)
    (files "x11-base")
    (parent (x11))
+   (import (runtime ustring)
+         cp1-ref
+         ustring-cp-size
+         ustring?)
 +  (export ()
 +        x-close-all-displays)
    (export (x11)
-         ->bytes
+         ->cstring
          x-visual-deallocate
          x-close-display
 -        x-close-all-displays
          x-window-set-input-hint
          x-window-set-name
          x-window-set-icon-name