Updated with latest settings (from build.properties actually to be sure that all the settings work).
Authored by: keess 2011-12-09
Parent: [r2346]
Child: [r2348]
