Code

Merge branch 'master' of .
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Sep 2005 22:32:55 +0000 (15:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Sep 2005 22:32:55 +0000 (15:32 -0700)

Trivial merge