Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Thu, 17 Jun 2010 01:10:41 +0000 (03:10 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Thu, 17 Jun 2010 01:10:41 +0000 (03:10 +0200)

Trivial merge