Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Tue, 1 Jun 2010 16:19:00 +0000 (18:19 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Tue, 1 Jun 2010 16:19:00 +0000 (18:19 +0200)

Trivial merge