Testing: Merge through r5897 from trunk. All tests PASS.
Authored by: ecarter 2007-08-08
Parent: [r5897]
Child: [r5899]