christos 4674124bb1 resolve conflicts		2007-01-27 21:24:09 +00:00
..
HTML_COPYRIGHT	import the real 9.3.2 not 9.2.3.	2005-12-21 23:06:48 +00:00
MAN_COPYRIGHT	import the real 9.3.2 not 9.2.3.	2005-12-21 23:06:48 +00:00