Merge branch 'maint' to sync with 1.5.2.5

author Junio C Hamano <gitster@pobox.com>

Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)

committer Junio C Hamano <gitster@pobox.com>

Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)
author Junio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)
committer Junio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)
diff --cc builtin-add.c
Simple merge
diff --cc t/t2200-add-update.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)
		1	2
builtin-add.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t2200-add-update.sh	patch \|	diff1 \|	diff2 \|	blob \| history