merge change of MAIN branch to revision 1.15
Authored by: kwmt 2002-01-26
Parent: [r1197]
Child: [r1199]