Sync with "almost" 1.7.12.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:40:07 +0000 (15:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:40:07 +0000 (15:40 -0700)

Trivial merge