Integrate mainline
Nick Ing-Simmons [Fri, 26 Jun 1998 16:46:13 +0000 (16:46 +0000)]
p4raw-id: //depot/ansiperl@1220


Trivial merge