Merged changes from final stable version (tag: Rel1_4).
Authored by: wackston 2001-06-09
Parent: [r555]
Child: [r557]