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>
Sun, 10 Apr 2011 18:15:56 +0000 (20:15 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Sun, 10 Apr 2011 18:15:56 +0000 (20:15 +0200)

Trivial merge