Testing: merge through r6119, all tests pass
Authored by: ecarter 2008-01-25
Parent: [r6408]
Child: [r6410]