WorkFlow: Merge changes from trunk up to r5168 into the workflow branch.
(Resolved one minor whitespace conflict.)
Authored by: ecarter 2007-04-02
Parent: [r5169]
Child: [r5171]