Richard Levitte cb9c5dc571 Merge from main, all conflicts resolved.
(I do this far too seldom...)
2000-07-12 16:34:34 +00:00
..
2000-04-27 15:07:15 +00:00
1999-05-31 21:58:18 +00:00
2000-04-27 15:07:15 +00:00