Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@Macintosh-69.local>
Thu, 17 Dec 2009 00:19:17 +0000 (16:19 -0800)
committerPeter Kasson <kasson@Macintosh-69.local>
Thu, 17 Dec 2009 00:19:17 +0000 (16:19 -0800)

Trivial merge