Merge branches 'jc/sb' and 'jc/mb'
authorJunio C Hamano <junkio@cox.net>
Fri, 11 Nov 2005 18:52:59 +0000 (10:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 11 Nov 2005 18:52:59 +0000 (10:52 -0800)

Trivial merge