enable universal and combined for PPC on MacOS X
Merge branch 'develop'