Merge branch 'master' of git.gromacs.org:gromacs
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sun, 4 Apr 2010 18:29:26 +0000 (20:29 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Sun, 4 Apr 2010 18:29:26 +0000 (20:29 +0200)

Trivial merge