Merge branch 'master' of git@git.gromacs.org:gromacs
authorBerk Hess <hess@csbl10.cbr.su.se>
Fri, 18 Sep 2009 12:21:55 +0000 (14:21 +0200)
committerBerk Hess <hess@csbl10.cbr.su.se>
Fri, 18 Sep 2009 12:21:55 +0000 (14:21 +0200)

Trivial merge