merge change of MAIN branch to revision 1.93
Authored by: kwmt 2002-04-29
Parent: [r1427]
Child: [r1429]