Testing: merge through r6020 from trunk.
Authored by: ecarter 2007-09-20
Parent: [r6036]
Child: [r6038]