K 10
svn:author
V 3
hrs
K 8
svn:date
V 27
2001-11-24T21:21:57.000000Z
K 7
svn:log
V 101
Merge the following from the English version:

	1.18  -> 1.22 	Makefile
	1.3   -> 1.4  	Makefile.inc

END
