Add in the changes for version 6.18.0.
Authored by: david_costanzo 2007-12-16
Parent: [r2522]
Child: [r2524]