Merge "Merge release-4-6 into master"
authorTeemu Murtola <teemu.murtola@gmail.com>
Wed, 2 May 2012 04:08:56 +0000 (06:08 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 2 May 2012 04:08:56 +0000 (06:08 +0200)

Trivial merge