0.12dev: merged [7232-7235,7237/branches/0.11-stable] via svnmerge
Authored by: cboos 2008-06-25
Parent: [r7252]
Child: [r7254]