Merge "Merge remote-tracking branch 'origin/release-4-6'"
authorTeemu Murtola <teemu.murtola@gmail.com>
Tue, 26 Jun 2012 13:47:13 +0000 (15:47 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 26 Jun 2012 13:47:13 +0000 (15:47 +0200)

Trivial merge