Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@cbr.su.se>
Tue, 17 Aug 2010 18:13:37 +0000 (20:13 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Tue, 17 Aug 2010 18:13:37 +0000 (20:13 +0200)

Trivial merge