Merge 1.7.6.4 in

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

Junio C Hamano committed Sep 23, 2011 at 15:31 UTC b7619006ebd9c9760b34bb38e04ce4dc8c606483

No changes.