Merge branch 'master' of git@git.gromacs.org:gromacs
authorDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Mon, 14 Sep 2009 08:42:04 +0000 (10:42 +0200)
committerDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Mon, 14 Sep 2009 08:42:04 +0000 (10:42 +0200)

Trivial merge