Merge branch 'master' into yaz-728

diff --combined win/makefile
index 401b7e4,661d78e..02e3ad1
--- 1/win/makefile
--- 2/win/makefile
+++ b/win/makefile
@@@ -7,8 -7,8 +7,8 @@@ DEBUG=0   # 0 for release, 1 for debu
  USE_MANIFEST = 1
  
  # TCL
- TCL="C:\Tcl\bin\tclsh85.exe"
- #TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+ TCL=tclsh
+ #TCL="C:\Tcl\bin\tclsh85.exe"
  HAVE_TCL=1
  
  # iconv charcter conversion utility
@@@ -457,7 -457,6 +457,7 @@@ MISC_OBJS= 
     $(OBJDIR)\readconf.obj \
     $(OBJDIR)\tpath.obj \
     $(OBJDIR)\wrbuf.obj \
 +   $(OBJDIR)\wrbuf_sha1.obj \
     $(OBJDIR)\xmalloc.obj \
     $(OBJDIR)\matchstr.obj \
     $(OBJDIR)\siconv.obj \