Merge "Merge 'origin/release-4-6' into master"
authorRoland Schulz <roland@utk.edu>
Wed, 16 May 2012 15:56:51 +0000 (17:56 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 16 May 2012 15:56:51 +0000 (17:56 +0200)

Trivial merge