Merge branch 'master' of git.gromacs.org:gromacs
authorSander Pronk <sander@csbm09.cbr.su.se>
Wed, 7 Oct 2009 09:20:49 +0000 (11:20 +0200)
committerSander Pronk <sander@csbm09.cbr.su.se>
Wed, 7 Oct 2009 09:20:49 +0000 (11:20 +0200)

Trivial merge