0.10.4dev: ported r4962 to stable (''follow-up to r4342 and fix #4802'')
Authored by: cboos 2007-03-11
Parent: [r4962]
Child: [r4964]