Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Tue, 6 Apr 2010 15:40:30 +0000 (17:40 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Tue, 6 Apr 2010 15:40:30 +0000 (17:40 +0200)

Trivial merge