Merge branch 'master' of git.gromacs.org:gromacs
authorCarsten Kutzner <ckutzne@gwdg.de>
Tue, 30 Nov 2010 12:55:01 +0000 (13:55 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Tue, 30 Nov 2010 12:55:01 +0000 (13:55 +0100)

Trivial merge