Merge branch 'maint-1.7.9' into maint

* maint-1.7.9:

Junio C Hamano committed Apr 10, 2012 at 12:44 UTC fdec2eb8ebbf995a77e2ab9971565c792b52944a

No changes.