0.12dev: blocked revisions r7196, r7198 via svnmerge
Authored by: cboos 2008-06-13
Parent: [r7209]
Child: [r7211]