Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 08:02:56 +0000 (00:02 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 08:02:56 +0000 (00:02 -0800)

Trivial merge