Merge branch 'maint' to sync with 1.7.2.2
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Aug 2010 23:04:41 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Aug 2010 23:05:04 +0000 (16:05 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Trivial merge