Merge "Merge release-4-6 into master"
authorRoland Schulz <roland@utk.edu>
Wed, 25 Jan 2012 18:37:09 +0000 (19:37 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 25 Jan 2012 18:37:09 +0000 (19:37 +0100)

Trivial merge