Merge branch 'master' of git.gromacs.org:gromacs
commitb6a860ccad799b08ef7eff134d96a240f57e9243
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Thu, 10 Jun 2010 12:40:49 +0000 (10 14:40 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Thu, 10 Jun 2010 12:40:49 +0000 (10 14:40 +0200)
treeaf64fd60f3bef3d95c56dc7e2586705b553de7c9
parenta1f6f40e404b569e5a6dad77f5e5135a0f7633ef
parentfe650a137ca16be8485f3c4e8b32e61b726f1fc0
Merge branch 'master' of git.gromacs.org:gromacs