Code

Merge branch 'maint' to sync with 1.7.3.5
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:50:33 +0000 (14:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:50:33 +0000 (14:50 -0800)

Trivial merge