Sync with 1.6.5.6

author Junio C Hamano <gitster@pobox.com>

Fri, 11 Dec 2009 00:20:59 +0000 (16:20 -0800)

committer Junio C Hamano <gitster@pobox.com>

Fri, 11 Dec 2009 00:20:59 +0000 (16:20 -0800)
author Junio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2009 00:20:59 +0000 (16:20 -0800)
committer Junio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2009 00:20:59 +0000 (16:20 -0800)
diff --cc Documentation/git.txt
Simple merge
diff --cc Documentation/githooks.txt
Simple merge
diff --cc upload-pack.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Fri, 11 Dec 2009 00:20:59 +0000 (16:20 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 11 Dec 2009 00:20:59 +0000 (16:20 -0800)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/githooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
upload-pack.c	patch \|	diff1 \|	diff2 \|	blob \| history