Merging latest changes from Arno's build and Joshua's branch
Authored by: shaeberling 2009-01-02
Parent: [r86]
Child: [r88]