Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@Macintosh-69.local>
Wed, 11 Nov 2009 18:06:58 +0000 (10:06 -0800)
committerPeter Kasson <kasson@Macintosh-69.local>
Wed, 11 Nov 2009 18:06:58 +0000 (10:06 -0800)

Trivial merge