Merge "Merge release-4-5-patches into release-4-6" into release-4-6
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Sun, 18 Mar 2012 08:08:44 +0000 (09:08 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 18 Mar 2012 08:08:44 +0000 (09:08 +0100)

Trivial merge