Merge branch 'master' of git@git.gromacs.org:gromacs
authorErik Marklund <erikm@anfinsen.bmc.uu.se>
Tue, 11 May 2010 10:26:44 +0000 (12:26 +0200)
committerErik Marklund <erikm@anfinsen.bmc.uu.se>
Tue, 11 May 2010 10:26:44 +0000 (12:26 +0200)

Trivial merge