Code

Merge early part of 'jc/combine' branch
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 07:21:50 +0000 (00:21 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 07:21:50 +0000 (00:21 -0700)

Trivial merge