Merge GIT 1.5.0.4

author Junio C Hamano <junkio@cox.net>

Wed, 14 Mar 2007 22:59:04 +0000 (15:59 -0700)

committer Junio C Hamano <junkio@cox.net>

Wed, 14 Mar 2007 22:59:04 +0000 (15:59 -0700)
author Junio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 22:59:04 +0000 (15:59 -0700)
committer Junio C Hamano <junkio@cox.net>
Wed, 14 Mar 2007 22:59:04 +0000 (15:59 -0700)
diff --cc Documentation/git-config.txt
Simple merge
diff --cc git-checkout.sh
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Wed, 14 Mar 2007 22:59:04 +0000 (15:59 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 14 Mar 2007 22:59:04 +0000 (15:59 -0700)
		1	2
Documentation/git-config.txt	patch \|	diff1 \|	diff2 \|	blob \| history
git-checkout.sh	patch \|	diff1 \|	diff2 \|	blob \| history