Merge pull request #1035 from gavinandresen/osxbuild