merge change of MAIN branch to revision 1.90
Authored by: kwmt 2002-04-18
Parent: [r1398]
Child: [r1400]