Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 21:36:39 +0000 (14:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 21:36:39 +0000 (14:36 -0700)

Trivial merge