From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Jun 2008 20:01:14 +0000 (-0700)
Subject: Merge 1.5.5.4 in
X-Git-Tag: v1.5.6-rc2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dceab837557077f70bf082727645925aec443500?hp=--cc

Merge 1.5.5.4 in

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

dceab837557077f70bf082727645925aec443500