Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Thu, 10 Jun 2010 19:13:15 +0000 (21:13 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Thu, 10 Jun 2010 19:13:15 +0000 (21:13 +0200)

Trivial merge