Merge branch 'release-4-5-patches'
authorErik Lindahl <lindahl@cbr.su.se>
Fri, 27 Aug 2010 21:21:12 +0000 (23:21 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Fri, 27 Aug 2010 21:21:12 +0000 (23:21 +0200)

Trivial merge