Merge branch 'master' of git.gromacs.org:gromacs
authorRossen Apostolov <rossen@cbr.su.se>
Wed, 12 May 2010 13:22:20 +0000 (15:22 +0200)
committerRossen Apostolov <rossen@cbr.su.se>
Wed, 12 May 2010 13:22:20 +0000 (15:22 +0200)

Trivial merge