Sync with 1.7.12.1
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Sep 2012 21:35:03 +0000 (14:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Sep 2012 21:35:03 +0000 (14:35 -0700)

Trivial merge