Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Sun, 20 Jun 2010 22:36:54 +0000 (00:36 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Sun, 20 Jun 2010 22:36:54 +0000 (00:36 +0200)

Trivial merge