Merge branch 'master' of git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Tue, 5 Oct 2010 09:40:08 +0000 (11:40 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Tue, 5 Oct 2010 09:40:08 +0000 (11:40 +0200)

Trivial merge