Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:33:31 +0000 (11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:33:31 +0000 (11:33 -0700)
Trivial merge