Merge "Merge branch 'release-4-6'"
authorChristoph Junghans <junghans@votca.org>
Wed, 13 Jun 2012 21:17:35 +0000 (23:17 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 13 Jun 2012 21:17:35 +0000 (23:17 +0200)

Trivial merge