Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Fri, 7 May 2010 13:52:14 +0000 (15:52 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Fri, 7 May 2010 13:52:14 +0000 (15:52 +0200)

Trivial merge