Merge branch 'master' of git.gromacs.org:gromacs
authorRossen Apostolov <rossen@cbr.su.se>
Thu, 29 Jul 2010 12:40:18 +0000 (14:40 +0200)
committerRossen Apostolov <rossen@cbr.su.se>
Thu, 29 Jul 2010 12:40:18 +0000 (14:40 +0200)

Trivial merge