* Update paths to use tools/ instead of scripts/ in osx-bundle.sh Originally committed to SVN as r3337.
Originally committed to SVN as r3270.