Richard Levitte cb9c5dc571 Merge from main, all conflicts resolved.
(I do this far too seldom...)
2000-07-12 16:34:34 +00:00
..
1999-04-29 16:04:54 +00:00