Merge branch 'maint-1.7.4' into maint

* maint-1.7.4:
This commit is contained in:
Junio C Hamano 2011-05-26 10:29:24 -07:00
commit 5a6d82d086

Diff Content Not Available