Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@cbr.su.se>
Sat, 9 Oct 2010 09:56:58 +0000 (11:56 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Sat, 9 Oct 2010 09:56:58 +0000 (11:56 +0200)

Trivial merge