Will rebase ''wiki-rename'' branch (#1106)
Authored by: cboos 2009-08-20
Parent: [r8477]
Child: [r8479]
