Add in the changes from 6.25.0.
Authored by: david_costanzo 2009-08-24
Parent: [r2955]
Child: [r2957]