Add in changes for 6.24.0. Make the formatting consistent.
Authored by: david_costanzo 2009-05-24
Parent: [r2821]
Child: [r2823]