Sync with 1.7.8.5

author Junio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)

committer Junio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)
author: Junio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)
committer: Junio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)
diff --cc Makefile
Simple merge
diff --cc grep.c
Simple merge
diff --cc t/t4150-am.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
author	Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)
committer	Junio C Hamano <gitster@pobox.com>
committer	Mon, 27 Feb 2012 00:42:35 +0000 (16:42 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
grep.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t4150-am.sh	patch \|	diff1 \|	diff2 \|	blob \| history