Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@vspm47.Stanford.EDU>
Thu, 29 Jul 2010 18:12:25 +0000 (11:12 -0700)
committerPeter Kasson <kasson@vspm47.Stanford.EDU>
Thu, 29 Jul 2010 18:12:25 +0000 (11:12 -0700)

Trivial merge