Merge branch 'master' of git@git.gromacs.org:gromacs
authorSander Pronk <sander@csbm09.cbr.su.se>
Mon, 24 Aug 2009 10:36:34 +0000 (12:36 +0200)
committerSander Pronk <sander@csbm09.cbr.su.se>
Mon, 24 Aug 2009 10:36:34 +0000 (12:36 +0200)

Trivial merge