Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Wed, 19 May 2010 00:33:35 +0000 (02:33 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Wed, 19 May 2010 00:33:35 +0000 (02:33 +0200)

Trivial merge