Merge branch 'jn/web' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:39:53 +0000 (02:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:39:53 +0000 (02:39 -0700)

Trivial merge