0.12dev: merged [7650-7651,7655] from 0.11-stable
Authored by: cboos 2008-11-06
Parent: [r7655]
Child: [r7657]