Merge branch 'maint-1.7.11' into maint

Junio C Hamano committed Sep 12, 2012 at 14:08 UTC 3503e9ab32c7a478d0d985171c50a901a2695162

No changes.