Merge branch 'jn/web'

This commit is contained in:
Junio C Hamano
2006-08-12 19:24:15 -07:00