Merge branch 'master' of git@git.gromacs.org:gromacs
authorSander Pronk <pronk@cbr.su.se>
Mon, 10 May 2010 16:08:29 +0000 (18:08 +0200)
committerSander Pronk <pronk@cbr.su.se>
Mon, 10 May 2010 16:08:29 +0000 (18:08 +0200)

Trivial merge