Merge branches 'bf/doc' and 'db/tartree'
authorJunio C Hamano <junkio@cox.net>
Tue, 31 Jan 2006 06:41:00 +0000 (22:41 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 31 Jan 2006 06:41:00 +0000 (22:41 -0800)

Trivial merge