Merge branch 'maint'

author Junio C Hamano <gitster@pobox.com>

Sun, 2 May 2010 03:23:10 +0000 (20:23 -0700)

committer Junio C Hamano <gitster@pobox.com>

Sun, 2 May 2010 03:23:10 +0000 (20:23 -0700)
author Junio C Hamano <gitster@pobox.com>
Sun, 2 May 2010 03:23:10 +0000 (20:23 -0700)
committer Junio C Hamano <gitster@pobox.com>
Sun, 2 May 2010 03:23:10 +0000 (20:23 -0700)
diff --cc builtin/index-pack.c
Simple merge
diff --cc git-submodule.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Sun, 2 May 2010 03:23:10 +0000 (20:23 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sun, 2 May 2010 03:23:10 +0000 (20:23 -0700)
		1	2
builtin/index-pack.c	patch \|	diff1 \|	diff2 \|	blob \| history
git-submodule.sh	patch \|	diff1 \|	diff2 \|	blob \| history