Merge branch 'master' of git@git.gromacs.org:gromacs
authorRoland Schulz <rschulz@rschulz-laptop.(none)>
Sun, 7 Mar 2010 20:17:04 +0000 (15:17 -0500)
committerRoland Schulz <rschulz@rschulz-laptop.(none)>
Sun, 7 Mar 2010 20:17:04 +0000 (15:17 -0500)

Trivial merge