Merge "Merge remote-tracking branch 'gerrit/release-4-6'"
authorChristoph Junghans <junghans@votca.org>
Tue, 26 Jun 2012 00:08:14 +0000 (02:08 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 26 Jun 2012 00:08:14 +0000 (02:08 +0200)

Trivial merge