Merge branch 'release-4-5-patches'
commitf849b3b9d47ffe58fb49e01159dcd2181a2b73e1
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 4 Aug 2010 07:38:46 +0000 (4 09:38 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 4 Aug 2010 07:38:46 +0000 (4 09:38 +0200)
treef4e41b8200b201fc065286ea04c7b017ef840298
parentf15e285ce566e6b6d1fe3bf2e5dbf3a6e87d5faf
parent340a951e9f42dce6dacbe04179809fd381ce2836
Merge branch 'release-4-5-patches'