Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@wavelan-177.vlan-103.publik.su.se>
Wed, 30 Jun 2010 13:10:28 +0000 (06:10 -0700)
committerPeter Kasson <kasson@wavelan-177.vlan-103.publik.su.se>
Wed, 30 Jun 2010 13:10:28 +0000 (06:10 -0700)

Trivial merge