Merge branch 'master' of git@git.gromacs.org:gromacs
authorPeter Kasson <kasson@DN0a20fb20.SUNet>
Mon, 14 Dec 2009 16:23:48 +0000 (08:23 -0800)
committerPeter Kasson <kasson@DN0a20fb20.SUNet>
Mon, 14 Dec 2009 16:23:48 +0000 (08:23 -0800)

Trivial merge