K 10
svn:author
V 3
hrs
K 8
svn:date
V 27
2003-04-27T15:41:37.000000Z
K 7
svn:log
V 357
Merge from the English version:

	1.2   -> 1.4  	contributing/Makefile
	1.1   -> 1.3  	dialup-firewall/Makefile
	1.5   -> 1.7  	diskless-x/Makefile
	1.8   -> 1.10 	fonts/Makefile
	1.20  -> 1.21 	fonts/article.sgml
	1.2   -> 1.4  	ipsec-must/Makefile
	1.8   -> 1.10 	multi-os/Makefile
	1.33  -> 1.35 	multi-os/article.sgml
	1.1   -> 1.3  	zip-drive/Makefile

END