Merge fixes up to GIT 1.1.2

author Junio C Hamano <junkio@cox.net>

Sat, 14 Jan 2006 00:51:21 +0000 (16:51 -0800)

committer Junio C Hamano <junkio@cox.net>

Sat, 14 Jan 2006 00:51:21 +0000 (16:51 -0800)
author Junio C Hamano <junkio@cox.net>
Sat, 14 Jan 2006 00:51:21 +0000 (16:51 -0800)
committer Junio C Hamano <junkio@cox.net>
Sat, 14 Jan 2006 00:51:21 +0000 (16:51 -0800)
diff --cc describe.c
Simple merge
diff --cc show-branch.c
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Sat, 14 Jan 2006 00:51:21 +0000 (16:51 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Sat, 14 Jan 2006 00:51:21 +0000 (16:51 -0800)
		1	2
describe.c	patch \|	diff1 \|	diff2 \|	blob \| history
show-branch.c	patch \|	diff1 \|	diff2 \|	blob \| history