Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
This commit is contained in:
Junio C Hamano 2009-03-21 23:10:42 -07:00
commit c0250b6477

Diff Content Not Available