Testing: Merge 5842 from trunk. NOTE: All tests pass.
Authored by: ecarter 2007-07-16
Parent: [r5842]
Child: [r5844]