Merge branch 'master' of git.gromacs.org:gromacs
authorErik Lindahl <lindahl@cbr.su.se>
Thu, 5 May 2011 10:57:56 +0000 (11:57 +0100)
committerErik Lindahl <lindahl@cbr.su.se>
Thu, 5 May 2011 10:57:56 +0000 (11:57 +0100)

Trivial merge