Merge fixes up to GIT 1.1.5
commit767e130915015f897fb87b939843b4882212574b
authorJunio C Hamano <junkio@cox.net>
Fri, 27 Jan 2006 22:50:10 +0000 (27 14:50 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 27 Jan 2006 22:50:10 +0000 (27 14:50 -0800)
tree4a00aa0e76a534828dc0b6638e1d87f82e2f404a
parentb3bf974cab4569221b5a1249d1a692e7190896f8
parent2111168f314ac4f53932b8bbb16191a3855f5b6f
Merge fixes up to GIT 1.1.5

Signed-off-by: Junio C Hamano <junkio@cox.net>