Testing: merge through r6128, except r6120 and r6122. All tests pass.
Authored by: ecarter 2008-01-25
Parent: [r6411]
Child: [r6413]