Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@cbr.su.se>
Thu, 26 Aug 2010 22:21:02 +0000 (00:21 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Thu, 26 Aug 2010 22:21:02 +0000 (00:21 +0200)

Trivial merge