Merge part of kh/svnimport branch into master
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Feb 2006 23:46:39 +0000 (15:46 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Feb 2006 23:46:39 +0000 (15:46 -0800)

Trivial merge