Merge branch 'master' of git.gromacs.org:gromacs
authorDavid van der Spoel <spoel@leyster.bmc.uu.se>
Wed, 2 Jun 2010 12:41:08 +0000 (14:41 +0200)
committerDavid van der Spoel <spoel@leyster.bmc.uu.se>
Wed, 2 Jun 2010 12:41:08 +0000 (14:41 +0200)

Trivial merge