Merge branch 'master' of git.gromacs.org:gromacs
authorErik Lindahl <lindahl@cbr.su.se>
Fri, 30 Jul 2010 12:03:31 +0000 (14:03 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Fri, 30 Jul 2010 12:03:31 +0000 (14:03 +0200)

Trivial merge