Merge branch 'master' of git.gromacs.org:gromacs
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Thu, 8 Jul 2010 20:49:59 +0000 (22:49 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Thu, 8 Jul 2010 20:49:59 +0000 (22:49 +0200)

Trivial merge