Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:38:20 +0000 (21:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:38:20 +0000 (21:38 -0700)

Trivial merge