0.12dev: Blocked 0.11-stable revisions [6941,6972,6980,7013] via svnmerge
Authored by: cboos 2008-05-09
Parent: [r7035]
Child: [r7037]
