Merge branch 'master' of git@git.gromacs.org:gromacs
authorRoland Schulz <rschulz@rschulz-laptop.(none)>
Mon, 10 May 2010 15:32:05 +0000 (11:32 -0400)
committerRoland Schulz <rschulz@rschulz-laptop.(none)>
Mon, 10 May 2010 15:32:05 +0000 (11:32 -0400)

Trivial merge