Merge refs/heads/master from paulus
authorJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 07:44:44 +0000 (00:44 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 07:44:44 +0000 (00:44 -0700)

Trivial merge