Ported [4176] to 0.10-stable (''follow-up to r4162'')
Authored by: cboos 2006-11-07
Parent: [r4176]
Child: [r4178]