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