Merge "Merge branch 'release-4-5-patches'" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 25 Apr 2013 13:33:36 +0000 (15:33 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 25 Apr 2013 13:33:36 +0000 (15:33 +0200)

Trivial merge