0.12dev: merged [7405,7414,7447] via svnmerge from [source:branches/0.11-stable]
Authored by: cboos 2008-09-12
Parent: [r7532]
Child: [r7534]