K 10
svn:author
V 3
hrs
K 8
svn:date
V 27
2004-12-29T17:28:47.000000Z
K 7
svn:log
V 176
Merge the following from the English version:

	1.434 -> 1.436	contributors/article.sgml
	1.16  -> 1.17 	diskless-x/article.sgml
	1.4   -> 1.11 	fbsd-from-scratch/article.sgml

END
