Testing: merge through r5978, except for r5962, from trunk.
Authored by: ecarter 2007-08-28
Parent: [r5978]
Child: [r5980]