Testing: merge through 5877 from trunk. All tests PASS.
Authored by: ecarter 2007-07-27
Parent: [r5879]
Child: [r5881]