Merge branch 'master' of git@git.gromacs.org:gromacs
authorDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Tue, 31 May 2011 07:19:38 +0000 (09:19 +0200)
committerDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Tue, 31 May 2011 07:19:38 +0000 (09:19 +0200)

Trivial merge