Markup branch: a few clean-ups, follow-up to [3713:3714]
Authored by: cboos 2006-09-10
Parent: [r3714]
Child: [r3716]