Merge branch 'master' of .
authorJunio C Hamano <junkio@cox.net>
Tue, 6 Sep 2005 20:51:33 +0000 (13:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 6 Sep 2005 20:51:33 +0000 (13:51 -0700)

Trivial merge