Testing: merge through r6060, all tests pass
Authored by: ecarter 2008-01-25
Parent: [r6402]
Child: [r6404]