Merge changes I9b865c4c,Ib709290e into release-4-6
authorSzilárd Páll <pszilard@kth.se>
Wed, 28 Nov 2012 13:51:48 +0000 (14:51 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 28 Nov 2012 13:51:48 +0000 (14:51 +0100)
* changes:
  use tMPI API for thread affinity setting
  Fixed Windows tMPI_Thread_self().


Trivial merge