Merge branch 'release-4-5-patches'
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sun, 28 Nov 2010 10:13:05 +0000 (11:13 +0100)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Sun, 28 Nov 2010 10:13:05 +0000 (11:13 +0100)

Trivial merge