Sync with 1.7.1.1
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 18:24:36 +0000 (11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 18:24:36 +0000 (11:24 -0700)
commitc9eaaab4165d8f402930d12899ec097495b599e6
treea2a87dcdeb059a2b1de7090380564e524e4e78fb
parent1ba5c532e1f6ede63fd46bf6b647e70baa10a364
parenta1463920565c67646507dc573d3f5280fa4cdcf3
Sync with 1.7.1.1

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