Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@csbm02.cbr.su.se>
Thu, 26 Aug 2010 09:18:46 +0000 (11:18 +0200)
committerErik Lindahl <lindahl@csbm02.cbr.su.se>
Thu, 26 Aug 2010 09:18:46 +0000 (11:18 +0200)

Trivial merge