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