Apply Jack's patch attached to

[ 508779 ] Disable flat namespace on MacOS X

I presume you wanted this on the trunk too, Jack?

2.2.1 candidate.