merge change of MAIN branch to revision 1.17
Authored by: kwmt 2002-04-18
Parent: [r1399]
Child: [r1401]