Snow Leopard: Fix to avoid linking main function, which is the only function in the root path
Merge remote-tracking branch 'origin/master'