Merge branch 'master' of git.gromacs.org:gromacs
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 11 Dec 2010 20:34:57 +0000 (21:34 +0100)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 11 Dec 2010 20:34:57 +0000 (21:34 +0100)

Trivial merge