0.12dev: merged revisions r7320 and r7327 from 0.11-stable (r7325 was already merged), via svnmerge.
Authored by: cboos 2008-07-08
Parent: [r7330]
Child: [r7332]