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)

Trivial merge