Merge branches/TCHAIN from r12476 (its creation point) into trunk.
authorsewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Fri, 20 Apr 2012 23:58:55 +0000 (23:58 +0000)
committersewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Fri, 20 Apr 2012 23:58:55 +0000 (23:58 +0000)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12517 a5019735-40e9-0310-863c-91ae7b9d1cf9

1  2 
coregrind/m_main.c

Simple merge