Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Mon, 16 Jan 2006 05:34:31 +0000 (21:34 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 16 Jan 2006 05:34:31 +0000 (21:34 -0800)
commit0620db36f85788193de2102884ff8dd94222660f
tree714f770dbc5ebfaefbcba7ac24062f46de0a160d
parent8cd162114990a4b36aeefc672dedc597c2eacbf0
parent7cb038a692ec0bdc0f442380678e8e87e26d4e68
Merge branch 'fix'