Merge branch 'maint-1.7.4' into maint

* maint-1.7.4:

Junio C Hamano committed May 26, 2011 at 10:29 UTC 5a6d82d0865a616bf22b9bbc3baea1ad4bd4b21b

No changes.