Markup branch: Merged [3546:3588/trunk].
Authored by: cmlenz 2006-08-02
Parent: [r3588]
Child: [r3590]