Testing: Merge through r5992 from trunk. All tests PASS.
Authored by: ecarter 2007-09-05
Parent: [r5992]
Child: [r5994]