commit ea2d6fd6aaf98d261df9fdf580542ebf01b7fba4
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Jul 01 00:20:20 2010 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Jul 01 00:20:20 2010 +0000
tree 20887e7d96d85c74a9b47009c5d59f9725f7b7bb
parent 69d495de9c26f1b99c9af8b2d366a09f23b47b76

Merged the MACOSX106 branch to the trunk.  Merge command:

  svn merge -r11143:HEAD svn://svn.valgrind.org/valgrind/branches/MACOSX106

There were some easy-to-resolve conflicts.

Then I had to fix up coregrind/link_tool_exe*.in -- those files had been
added independently on both the trunk and the branch, AFAICT.  I just
overwrote the trunk versions with the branch versions.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11194 a5019735-40e9-0310-863c-91ae7b9d1cf9