2.0.8RC3 fixes PR1283154 and 1286139 and 1288025 (partially).
Authored by: jost2345 2005-09-13
Parent: [r338]
Child: [r340]