Merge branch 'master' of git.gromacs.org:gromacs
authorCarsten Kutzner <ckutzne@gwdg.de>
Tue, 23 Nov 2010 13:42:33 +0000 (14:42 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Tue, 23 Nov 2010 13:42:33 +0000 (14:42 +0100)

Trivial merge