Merge branch 'ossau-gds-dev'

Conflicts:

	THANKS

diff --cc .gitignore
index 9d507e1,6c0e62d..8754b48
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -72,42 -74,6 +72,44 @@@ gdb-pre-inst-guil
  cscope.out
  cscope.files
  *.log
+ gds-test.debug
+ gds-test.transcript
  INSTALL
 +*.aux
 +*.cp
 +*.cps
 +*.dvi
 +*.fn
 +*.fns
 +*.ky
 +*.pg
 +*.toc
 +*.tp
 +*.vr
 +*.tps
 +*.vrs
 +*.pgs
 +*.rn
 +*.rns
 +/meta/gdb-uninstalled-guile
 +/meta/guile
 +/meta/uninstalled-env
 +/examples/box-module/box
 +/examples/box/box
 +/lib/alloca.h
 +/lib/charset.alias
 +/lib/configmake.h
 +/lib/ref-add.sed
 +/lib/ref-del.sed
 +/lib/stdlib.h
 +/lib/string.h
 +/lib/strings.h
 +/lib/sys/file.h
 +/lib/time.h
 +/lib/unistd.h
 +/lib/unistr/.dirstamp
 +/GPATH
 +/GRTAGS
 +/GSYMS
 +/GTAGS
 +/meta/guile-tools

diff --cc THANKS
index 17816c5,eae5dc1..9012109
--- 1/THANKS
--- 2/THANKS
+++ b/THANKS
@@@ -115,7 -108,7 +117,8 @@@ For fixes or providing information whic
        Andreas Vögele
          Michael Talbot-Wilson
          Michael Tuexen
+          Thomas Wawrzinek
 +        Mark H. Weaver
              Jon Wilson
             Andy Wingo
            Keith Wright

diff --cc emacs/gds-server.el
Simple merge

diff --cc emacs/gds.el
Simple merge

diff --cc module/ice-9/gds-client.scm
Simple merge

diff --cc module/ice-9/gds-server.scm
Simple merge