Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:44:34 +0000 (09:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:44:34 +0000 (09:44 -0700)
Trivial merge