From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Jul 2008 00:19:34 +0000 (-0700)
Subject: Merge maint in
X-Git-Tag: v1.6.0-rc0~172
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/951b09ce363f503d7bbd9dfa01b5a3ea2623c3d8

Merge maint in
---

951b09ce363f503d7bbd9dfa01b5a3ea2623c3d8