WikiRename branch synced with [6425:6490/trunk]
Authored by: cboos 2008-02-08
Parent: [r6497]
Child: [r6499]