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

Trivial merge