Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@Macintosh-175.local>
Tue, 10 Aug 2010 08:49:05 +0000 (01:49 -0700)
committerPeter Kasson <kasson@Macintosh-175.local>
Tue, 10 Aug 2010 08:49:05 +0000 (01:49 -0700)

Trivial merge