Merge branch 'release-4-5-patches'
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 11 Dec 2010 20:35:23 +0000 (21:35 +0100)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 11 Dec 2010 20:35:23 +0000 (21:35 +0100)
commit98a8c238b69b74c4577fd73f18e84ae9d1882676
tree8b17183e905cb52283d400e01826433f3fb76ca8
parentbadd3ffd18088a178e6fff9811905275f9a09c24
parentc0df9f36d6baf211743e23d9889356aaf0e73304
Merge branch 'release-4-5-patches'