Testing: Merge through r6049, all tests pass.
Authored by: ecarter 2008-01-23
Parent: [r6400]
Child: [r6402]