Merging changes


Slide 20 of 39 17 May 1999 lm@bitmover.com