Sync with 1.6.4.2
authorJunio C Hamano <gitster@pobox.com>
Sat, 29 Aug 2009 21:52:03 +0000 (14:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 29 Aug 2009 21:52:03 +0000 (14:52 -0700)

Trivial merge