Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@cbr.su.se>
Wed, 25 Aug 2010 07:35:16 +0000 (09:35 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Wed, 25 Aug 2010 07:35:16 +0000 (09:35 +0200)

Trivial merge