Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@wavelan-177.vlan-103.publik.su.se>
Tue, 29 Jun 2010 15:27:54 +0000 (08:27 -0700)
committerPeter Kasson <kasson@wavelan-177.vlan-103.publik.su.se>
Tue, 29 Jun 2010 15:27:54 +0000 (08:27 -0700)

Trivial merge