Merge branch 'master' of .
authorJunio C Hamano <junkio@cox.net>
Mon, 12 Sep 2005 01:58:53 +0000 (18:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 12 Sep 2005 01:58:53 +0000 (18:58 -0700)

Trivial merge