Merge "Merge release-4-5-patches into release-4-6" into release-4-6
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Tue, 27 Nov 2012 09:46:16 +0000 (10:46 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 27 Nov 2012 09:46:16 +0000 (10:46 +0100)

Trivial merge