Merge with master to get diff fixes.

diff --combined Makefile
index 1623247273d2ec13e65fc74ecfca49b7e578ff2e,db7596504a3317b994b8e81c78f7d0c1011000db..c0a84298b5a0fde300d18b46bc77d4da8d2e11a4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.4
 +GIT_VERSION = 0.99.5
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -97,7 -97,7 +97,7 @@@ LIB_H=cache.h object.h blob.h tree.h co
  LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
         tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
         refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
-        sha1_name.o
+        sha1_name.o setup.o
  
  LIB_H += rev-cache.h
  LIB_OBJS += rev-cache.o