0.12dev: merge new fix for #7970 from 0.11-stable, i.e. [7942,7944-7945]
Authored by: cboos 2009-03-17
Parent: [r7947]
Child: [r7949]