Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@csbm02.cbr.su.se>
Mon, 2 Aug 2010 16:31:51 +0000 (18:31 +0200)
committerErik Lindahl <lindahl@csbm02.cbr.su.se>
Mon, 2 Aug 2010 16:31:51 +0000 (18:31 +0200)

Trivial merge