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