Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 07:33:38 +0000 (23:33 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 07:33:38 +0000 (23:33 -0800)

Trivial merge