Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@vspm47.Stanford.EDU>
Fri, 11 Dec 2009 21:38:07 +0000 (13:38 -0800)
committerPeter Kasson <kasson@vspm47.Stanford.EDU>
Fri, 11 Dec 2009 21:38:07 +0000 (13:38 -0800)

Trivial merge