Merge branch 'master' of git.gromacs.org:gromacs
commit311defe30177a8e28e5ab2e5bac024eee971945b
authorErik Marklund <erikm@banksy.bmc.uu.se>
Fri, 28 May 2010 12:53:41 +0000 (28 14:53 +0200)
committerErik Marklund <erikm@banksy.bmc.uu.se>
Fri, 28 May 2010 12:53:41 +0000 (28 14:53 +0200)
tree6360d058a409e332f6a2ba53a33b2aabe58c8bbb
parentea88a0bf09a369a60c46b02924f2e8298722fc14
parenta5d98473c097bc330caf08a9db90f09def6b707c
Merge branch 'master' of git.gromacs.org:gromacs