Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Thu, 28 Oct 2010 20:26:28 +0000 (22:26 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Thu, 28 Oct 2010 20:26:28 +0000 (22:26 +0200)

Trivial merge