Re-apply changes 4adc95e616bac7ee and 200cbd6aa595a074 (RT #61492)
[p5sagit/p5-mst-13.2.git] / apollo /
1999-03-24 Gurusamy Sarathy integrate changes#3116,3119 from maint-5.005