Fixed the merging from branch to get the projects working
Authored by: hotzst 2009-10-02
Parent: [r2552]
Child: [r2554]