Testing: merge through r6121, except r6120, all tests pass
Authored by: ecarter 2008-01-25
Parent: [r6409]
Child: [r6411]