Markup branch: updates and fixes corresponding to [Markup 242]
Authored by: cboos 2006-08-23
Parent: [r3639]
Child: [r3641]