Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Thu, 18 Mar 2010 12:55:47 +0000 (13:55 +0100)
committerSzilard Pall <pszilard@cbr.su.se>
Thu, 18 Mar 2010 12:55:47 +0000 (13:55 +0100)

Trivial merge