Creating a work branch to finalize #975.
Authored by: cboos 2007-01-10
Parent: [r4536]
Child: [r4538]