Merge "Merge branch 'release-4-5-patches' into release-4-6" into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Thu, 17 Jan 2013 22:02:49 +0000 (23:02 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 17 Jan 2013 22:18:55 +0000 (23:18 +0100)

Trivial merge