Merge branch 'master' of git@git.gromacs.org:gromacs
authorCarsten Kutzner <ckutzne@gwdg.de>
Mon, 21 Dec 2009 15:15:22 +0000 (16:15 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Mon, 21 Dec 2009 15:15:22 +0000 (16:15 +0100)

Trivial merge