Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@Macintosh-175.local>
Sat, 17 Apr 2010 23:52:51 +0000 (16:52 -0700)
committerPeter Kasson <kasson@Macintosh-175.local>
Sat, 17 Apr 2010 23:52:51 +0000 (16:52 -0700)

Trivial merge