Code

Merge branches 'jc/branch' and 'jc/rebase'
authorJunio C Hamano <junkio@cox.net>
Fri, 18 Nov 2005 23:54:23 +0000 (15:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 18 Nov 2005 23:54:23 +0000 (15:54 -0800)

Trivial merge