Reincorporation of changes between version 1.26 and 1.27 that were faultly removed with version 1.28
Authored by: biquard 2001-12-05
Parent: [r1013]
Child: [r1015]
