merge change of MAIN branch to revision 1.80
Authored by: kwmt 2002-02-26
Parent: [r1289]
Child: [r1291]