Resolve latest
Nick Ing-Simmons [Fri, 19 Jun 1998 15:38:28 +0000 (15:38 +0000)]
p4raw-id: //depot/ansiperl@1151


Trivial merge