0.12dev: merged r7219 from 0.11-stable (''Back to report broken link #7357'')
Authored by: cboos 2008-06-19
Parent: [r7219]
Child: [r7221]