Merge branch 'master' of .
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Sep 2005 22:47:28 +0000 (15:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Sep 2005 22:47:28 +0000 (15:47 -0700)
Trivial merge