Merge branch 'release-4-5-patches'
commit370eb8950a7381141b5092e89069392ee3e4031b
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Tue, 3 Aug 2010 08:10:35 +0000 (3 10:10 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Tue, 3 Aug 2010 08:10:35 +0000 (3 10:10 +0200)
treed1a790bd306dfac51729314f9bd165944ca770d5
parentc32d7ad9c2c2371c6fdb52898b8f20ab74a79915
parentd2e120c3f553b2920670971c6a75dbc8a9e139d5
Merge branch 'release-4-5-patches'