Merge "Merge release-4-6 (commit 'Ic142a690')"
authorChristoph Junghans <junghans@votca.org>
Mon, 28 May 2012 23:09:14 +0000 (01:09 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 28 May 2012 23:09:14 +0000 (01:09 +0200)

Trivial merge