0.12dev: merged r7388 via svnmerge from 0.11-stable, also doing a few simplifications in wiki_diff.html at the occasion of resolving a conflict.
Authored by: cboos 2008-07-25
Parent: [r7402]
Child: [r7404]