Merge "updated several things related with OpenMP thread count" into release-4-6
authorBerk Hess <hess@kth.se>
Mon, 5 Nov 2012 21:38:58 +0000 (22:38 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 5 Nov 2012 21:38:58 +0000 (22:38 +0100)

Trivial merge