Merge 1.5.5.3 in

author Junio C Hamano <gitster@pobox.com>

Wed, 28 May 2008 05:22:47 +0000 (22:22 -0700)

committer Junio C Hamano <gitster@pobox.com>

Wed, 28 May 2008 05:34:19 +0000 (22:34 -0700)
author Junio C Hamano <gitster@pobox.com>
Wed, 28 May 2008 05:22:47 +0000 (22:22 -0700)
committer Junio C Hamano <gitster@pobox.com>
Wed, 28 May 2008 05:34:19 +0000 (22:34 -0700)
diff --cc Documentation/git.txt
Simple merge
diff --cc builtin-commit.c
Simple merge
diff --cc git-filter-branch.sh
Simple merge
diff --cc gitweb/gitweb.perl
Simple merge
diff --cc t/t7003-filter-branch.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Wed, 28 May 2008 05:22:47 +0000 (22:22 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 28 May 2008 05:34:19 +0000 (22:34 -0700)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
builtin-commit.c	patch \|	diff1 \|	diff2 \|	blob \| history
git-filter-branch.sh	patch \|	diff1 \|	diff2 \|	blob \| history
gitweb/gitweb.perl	patch \|	diff1 \|	diff2 \|	blob \| history
t/t7003-filter-branch.sh	patch \|	diff1 \|	diff2 \|	blob \| history