Merge branch 'release-4-5-patches'
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 4 Aug 2010 07:38:46 +0000 (09:38 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 4 Aug 2010 07:38:46 +0000 (09:38 +0200)

Trivial merge