Merge branch 'mr/hpux'

author Junio C Hamano <gitster@pobox.com>

Tue, 15 Mar 2011 21:21:47 +0000 (14:21 -0700)

committer Junio C Hamano <gitster@pobox.com>

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