Sync with 1.6.5.3

author Junio C Hamano <gitster@pobox.com>

Mon, 16 Nov 2009 08:06:23 +0000 (00:06 -0800)

committer Junio C Hamano <gitster@pobox.com>

Mon, 16 Nov 2009 08:06:30 +0000 (00:06 -0800)
author Junio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 08:06:23 +0000 (00:06 -0800)
committer Junio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 08:06:30 +0000 (00:06 -0800)
diff --cc Documentation/git.txt
Simple merge
diff --cc Makefile
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Mon, 16 Nov 2009 08:06:23 +0000 (00:06 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 16 Nov 2009 08:06:30 +0000 (00:06 -0800)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history