Checking mac-specific stuff from the 2.3a2 branch in on the trunk.
13 files changed