Markup branch: merged [3600:3658/trunk]
Authored by: cboos 2006-08-25
Parent: [r3658]
Child: [r3660]