Merge branch 'release-4-5-patches'
authorSzilard Pall <pszilard@cbr.su.se>
Mon, 6 Sep 2010 21:17:55 +0000 (23:17 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Mon, 6 Sep 2010 21:17:55 +0000 (23:17 +0200)

Trivial merge