Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@DN0a20fa6b.SUNet>
Mon, 27 Jul 2009 18:35:11 +0000 (11:35 -0700)
committerPeter Kasson <kasson@DN0a20fa6b.SUNet>
Mon, 27 Jul 2009 18:35:11 +0000 (11:35 -0700)

Trivial merge