Code

Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:51:23 +0000 (02:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:51:23 +0000 (02:51 -0700)

Trivial merge