Testing: Merge through [6473] from trunk. All tests pass.
Authored by: ecarter 2008-02-20
Parent: [r6561]
Child: [r6563]