Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:16:34 +0000 (10:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:16:34 +0000 (10:16 -0800)
* maint:
  Further preparation for 1.8.0.1


Trivial merge