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)
commitb411fda15df4897a1308bbb5950088ea6138cbad
tree7cd4fe3dee5f6f330263d1a4e10b23ec2d94dff5
parent7941602983f68e2cddafca5a2da8215d1271742b
parentca557afff9f7dad7a8739cd193ac0730d872e282
Merge early part of 'jc/combine' branch