Sync with 1.7.6.1

author Junio C Hamano <gitster@pobox.com>

Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700)

committer Junio C Hamano <gitster@pobox.com>

Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700)
author Junio C Hamano <gitster@pobox.com>
Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700)
committer Junio C Hamano <gitster@pobox.com>
Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700)
diff --cc Documentation/git.txt
Simple merge
diff --cc upload-pack.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 24 Aug 2011 19:18:02 +0000 (12:18 -0700)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
upload-pack.c	patch \|	diff1 \|	diff2 \|	blob \| history