Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@Macintosh-69.local>
Mon, 14 Dec 2009 03:06:39 +0000 (19:06 -0800)
committerPeter Kasson <kasson@Macintosh-69.local>
Mon, 14 Dec 2009 03:06:39 +0000 (19:06 -0800)

Trivial merge