Merge branch 'release-4-5-patches'
authorSzilard Pall <pszilard@cbr.su.se>
Wed, 8 Sep 2010 14:11:50 +0000 (16:11 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Wed, 8 Sep 2010 14:11:50 +0000 (16:11 +0200)

Trivial merge