Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@cbr.su.se>
Fri, 27 Aug 2010 17:45:23 +0000 (19:45 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Fri, 27 Aug 2010 17:45:23 +0000 (19:45 +0200)

Trivial merge