Testing: Merge through [6143] (excluding [6120] and [6122]) from trunk. All tests pass.
Authored by: ecarter 2008-02-17
Parent: [r6515]
Child: [r6517]