Testing: Merge through [5875] from trunk. All tests PASS.
Authored by: ecarter 2007-07-27
Parent: [r5875]
Child: [r5877]