Merge GIT 1.5.0.4

diff --git a/Makefile b/Makefile
index 45fe3663a5e8323967f7bf7cfc1e7f69a5cb0631..dc024d45c143359e2e647990f37d927a59267cc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -293,6 +293,7 @@ BUILTIN_OBJS = \
        builtin-diff-files.o \
        builtin-diff-index.o \
        builtin-diff-tree.o \
+       builtin-fetch--tool.o \
        builtin-fmt-merge-msg.o \
        builtin-for-each-ref.o \
        builtin-fsck.o \