Merge "fixed incorrect virial with virtual sites and OpenMP" into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Wed, 5 Dec 2012 19:28:41 +0000 (20:28 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 5 Dec 2012 19:28:41 +0000 (20:28 +0100)

Trivial merge