Merge branch 'fixes'

This commit is contained in:
Junio C Hamano
2005-10-20 23:19:47 -07:00