Testing: Merge through r5971 from trunk, except for r5962. All tests PASS.
Authored by: ecarter 2007-08-27
Parent: [r5974]
Child: [r5976]