Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:53:33 +0000 (15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:53:33 +0000 (15:53 -0700)

Trivial merge