Merge branch 'origin'
authorJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 02:42:08 +0000 (18:42 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 2 Mar 2006 02:42:08 +0000 (18:42 -0800)

Trivial merge