Merge 1.5.2.3 in
commit9a54463a8ab04f19a7f6127df7287320cc731a91
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:12:57 +0000 (2 01:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Jul 2007 08:12:57 +0000 (2 01:12 -0700)
tree54de2eb3fe156108e0b70aad5a44dec6e106b23e
parent71e55854fd6e5c9ce786bcd20efef43bd56f9df0
parent57887443c24e5a2b4b04e7db69b44b53d8e87b44
Merge 1.5.2.3 in

Signed-off-by: Junio C Hamano <gitster@pobox.com>