Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@vspm47.Stanford.EDU>
Tue, 13 Jul 2010 21:27:42 +0000 (14:27 -0700)
committerPeter Kasson <kasson@vspm47.Stanford.EDU>
Tue, 13 Jul 2010 21:27:42 +0000 (14:27 -0700)

Trivial merge