Merge "Merge release-4-6 into master"
authorTeemu Murtola <teemu.murtola@gmail.com>
Thu, 7 Mar 2013 18:44:03 +0000 (19:44 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 7 Mar 2013 18:44:03 +0000 (19:44 +0100)

Trivial merge