The warning shown in wiki manual merge mode was present twice, after the r6986 merge.
Authored by: cboos 2008-10-07
Parent: [r7590]
Child: [r7592]