merge change of MAIN branch to revision 1.16
Authored by: kwmt 2002-02-26
Parent: [r1288]
Child: [r1290]