Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
This commit is contained in:
Junio C Hamano 2009-03-12 23:37:16 -07:00
commit a54a216098

Diff Content Not Available