Merge branch 'maint' to sync with 1.6.3.2
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Jun 2009 05:51:56 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Jun 2009 05:51:56 +0000 (22:51 -0700)

Trivial merge