Merge branch 'maint-1.7.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:29:24 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:29:24 +0000 (10:29 -0700)
* maint-1.7.4:


Trivial merge