Merge "Fixed timing measurements." into release-4-5-patches
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Fri, 20 Jan 2012 08:15:33 +0000 (09:15 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 20 Jan 2012 08:15:33 +0000 (09:15 +0100)

Trivial merge