Merge branch 'mr/hpux' into maint

author Junio C Hamano <gitster@pobox.com>

Mon, 21 Mar 2011 05:11:15 +0000 (22:11 -0700)

committer Junio C Hamano <gitster@pobox.com>

Mon, 21 Mar 2011 05:11:15 +0000 (22:11 -0700)
author Junio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:11:15 +0000 (22:11 -0700)
committer Junio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:11:15 +0000 (22:11 -0700)
diff --cc Makefile
Simple merge
diff --cc git-compat-util.h
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Mon, 21 Mar 2011 05:11:15 +0000 (22:11 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 21 Mar 2011 05:11:15 +0000 (22:11 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
git-compat-util.h	patch \|	diff1 \|	diff2 \|	blob \| history