Merge branch 'master' of git@git.gromacs.org:gromacs
authorMaarten Wolf <mwolf@adriatica.mpibpc.intern>
Thu, 17 Jun 2010 14:29:39 +0000 (16:29 +0200)
committerMaarten Wolf <mwolf@adriatica.mpibpc.intern>
Thu, 17 Jun 2010 14:29:39 +0000 (16:29 +0200)

Trivial merge