Markup branch: moving the code around...
Authored by: cboos 2006-09-08
Parent: [r3703]
Child: [r3705]