Merge branch 'master' of git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Thu, 9 Sep 2010 19:37:32 +0000 (21:37 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Thu, 9 Sep 2010 19:37:32 +0000 (21:37 +0200)

Trivial merge