Code

Merge master.kernel.org:/home/hpa/git/daemon
authorJunio C Hamano <junkio@cox.net>
Wed, 28 Sep 2005 00:05:41 +0000 (17:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 28 Sep 2005 00:05:41 +0000 (17:05 -0700)

Trivial merge