Testing: merge through r6079, all tests pass
Authored by: ecarter 2008-01-25
Parent: [r6403]
Child: [r6405]