Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@Macintosh-69.local>
Sun, 8 Nov 2009 15:36:02 +0000 (07:36 -0800)
committerPeter Kasson <kasson@Macintosh-69.local>
Sun, 8 Nov 2009 15:36:02 +0000 (07:36 -0800)

Trivial merge