0.12dev: merged [7998-7999,8015] from 0.11-stable (fixes for #6588 and #8179)
Authored by: cboos 2009-04-06
Parent: [r8066]
Child: [r8068]