Sync with v1.7.10.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:20:46 +0000 (21:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:21:46 +0000 (21:21 -0700)
1  2 
GIT-VERSION-GEN

diff --cc GIT-VERSION-GEN
Simple merge