Merge "Merge release-4-6 into master"
authorTeemu Murtola <teemu.murtola@gmail.com>
Fri, 22 Mar 2013 12:27:22 +0000 (13:27 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 22 Mar 2013 12:27:22 +0000 (13:27 +0100)

Trivial merge