Merge branch 'master' of git://git.gromacs.org/gromacs
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 29 Jul 2010 07:28:00 +0000 (09:28 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 29 Jul 2010 07:28:00 +0000 (09:28 +0200)

Trivial merge