Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Tue, 16 Mar 2010 20:26:16 +0000 (21:26 +0100)
committerSzilard Pall <pszilard@cbr.su.se>
Tue, 16 Mar 2010 20:26:16 +0000 (21:26 +0100)

Trivial merge